Mercurial > pidgin
diff HACKING @ 25984:9115f71ad73a
Fixing busted merge
author | Paul Aurich <paul@darkrain42.org> |
---|---|
date | Sat, 07 Mar 2009 22:40:30 +0000 |
parents | d73ee2690376 |
children |
author | Paul Aurich <paul@darkrain42.org> |
---|---|
date | Sat, 07 Mar 2009 22:40:30 +0000 |
parents | d73ee2690376 |
children |