| commit | 165fff36ad42a0ccd3cc370a22deb03d12d1314d | |
| author | Mark Doliner <markdoliner@pidgin.im> | |
| Tue, 8 Mar 2011 02:27:47 +0000 (8 02:27 +0000) | ||
| committer | Mark Doliner <markdoliner@pidgin.im> | |
| Tue, 8 Mar 2011 02:27:47 +0000 (8 02:27 +0000) | ||
| tree | 39e75ed54d86c88d85d7758f40a0f961f61ca35d | treesnapshot (tar.gz zip) |
| parent | abfd913fdc37f529be75489e1aab81a419f1b455 | commitdiff |
| parent | f6129ad275139ad96c63db310bbe53522c5f11cb | commitdiff |
Merge ... '6159afdf4553bcc227296f683b2a61ad41eadabb'
and 'f17d06f43acdb460043b985494f83c8770daff10'
--HG--
extra : convert_revision : 556a04f5e3dc6f8e218513dd260fd60bb13c33c7
and 'f17d06f43acdb460043b985494f83c8770daff10'
--HG--
extra : convert_revision : 556a04f5e3dc6f8e218513dd260fd60bb13c33c7
| libpurple/protocols/jabber/jabber.c | diff1 | diff2 | blobhistory |