Mercurial > pidgin.yaz
comparison libpurple/protocols/jabber/auth.c @ 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 | 5c70d953a497 |
children | 915fdb649210 |
comparison
equal
deleted
inserted
replaced
25330:54a1c63873b2 | 25331:10e1f3c1d0db |
---|