Mercurial > pidgin.yaz
diff libpurple/protocols/jabber/chat.h @ 25331:10e1f3c1d0db
explicit merge of '8c6ea3b255d94e0f2867fea830b1380415e6d47a'
and '5459c606fe645dac4dddd188eca62eb52a9f7745'
to branch 'im.pidgin.pidgin.next.minor'
| author | Richard Laager <rlaager@wiktel.com> |
|---|---|
| date | Thu, 27 Nov 2008 06:05:42 +0000 |
| parents | 5793bcea224c |
| children | 5767b7698c73 |