Mercurial > pidgin
diff HACKING @ 25980:d24b476cc60f
Fix merge (i.e. reapply my changes here).
author | Paul Aurich <paul@darkrain42.org> |
---|---|
date | Sat, 07 Mar 2009 02:19:57 +0000 |
parents | d73ee2690376 |
children |
author | Paul Aurich <paul@darkrain42.org> |
---|---|
date | Sat, 07 Mar 2009 02:19:57 +0000 |
parents | d73ee2690376 |
children |