Mercurial > pidgin
diff ChangeLog.API @ 26755:ca2c3d134eaf
Fix a bad merge in 511953ddd75ccd866325fa6cf1e72dbb4fca3e82
| author | Paul Aurich <paul@darkrain42.org> |
|---|---|
| date | Thu, 30 Apr 2009 02:59:24 +0000 |
| parents | 89f613b16e2b |
| children | 76a1598ecf1c |
| author | Paul Aurich <paul@darkrain42.org> |
|---|---|
| date | Thu, 30 Apr 2009 02:59:24 +0000 |
| parents | 89f613b16e2b |
| children | 76a1598ecf1c |