pidgin: cf2df65f: merge of '0d389b1a3f186fbbea57629066032e...

[darkrain42 at pidgin.im]

----------------------------------------------------------------------
Revision: cf2df65f9e0f4ad50b66984877b5c33e4184858e
Parent:   0d389b1a3f186fbbea57629066032e0fe9b7a47d
Parent:   3e1e394a5c30d86e26a1419fbfbc1af5d31dff09
Author:   darkrain42 at pidgin.im
Date:     01/17/11 17:37:30
Branch:   im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/cf2df65f9e0f4ad50b66984877b5c33e4184858e

Changelog: 

merge of '0d389b1a3f186fbbea57629066032e0fe9b7a47d'
     and '3e1e394a5c30d86e26a1419fbfbc1af5d31dff09'

Changes against parent 0d389b1a3f186fbbea57629066032e0fe9b7a47d

  patched  libpurple/protocols/zephyr/Zinternal.c

Changes against parent 3e1e394a5c30d86e26a1419fbfbc1af5d31dff09

  patched  libpurple/protocols/jabber/auth_cyrus.c