pidgin: 78c8d89c: merge of '3100be309efb98a39bb8ef745c0302...

[darkrain42 at pidgin.im]

----------------------------------------------------------------------
Revision: 78c8d89c7ea5ba6b82e03f5a9462b85bd98f339d
Parent:   3100be309efb98a39bb8ef745c0302722534234a
Parent:   f7aa873b9699de75db73441a0ca52795d63cfae1
Author:   darkrain42 at pidgin.im
Date:     01/03/12 14:29:43
Branch:   im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/78c8d89c7ea5ba6b82e03f5a9462b85bd98f339d

Changelog: 

merge of '3100be309efb98a39bb8ef745c0302722534234a'
     and 'f7aa873b9699de75db73441a0ca52795d63cfae1'

Changes against parent 3100be309efb98a39bb8ef745c0302722534234a

  patched  pidgin/gtkconv.c

Changes against parent f7aa873b9699de75db73441a0ca52795d63cfae1

  patched  finch/finch.c
  patched  libpurple/protocols/jabber/auth_cyrus.c
  patched  pidgin/gtkmain.c