pidgin: dc300978: merge of '53b11891588df0478720a5c4065231...

[sadrul at pidgin.im]

-----------------------------------------------------------------
Revision: dc30097849427a1f44da9b415d72e65266d6f4fe
Ancestor: 53b11891588df0478720a5c40652312812cde6aa
Ancestor: 8af8abf5d55c259e186c6555093ee6d0a121749e
Author: sadrul at pidgin.im
Date: 2009-10-21T23:29:39
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/dc30097849427a1f44da9b415d72e65266d6f4fe

Modified files:
        ChangeLog finch/gntconn.c finch/gntconv.c libpurple/server.c
        pidgin/gtkconn.c pidgin/gtkconv.c pidgin/gtkpounce.c

ChangeLog: 

merge of '53b11891588df0478720a5c40652312812cde6aa'
     and '8af8abf5d55c259e186c6555093ee6d0a121749e'