pidgin: 9fc56c5e: merge of '3dbc4e50c575de418e1df8f965957b...

[darkrain42 at pidgin.im]

----------------------------------------------------------------------
Revision: 9fc56c5e4669dbbaa42a495b831982f2732e3895
Parent:   3dbc4e50c575de418e1df8f965957b195aeff2ca
Parent:   8e560053e153f10e0b7a2d211f7c20fbe7a2328d
Author:   darkrain42 at pidgin.im
Date:     06/20/11 02:07:38
Branch:   im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/9fc56c5e4669dbbaa42a495b831982f2732e3895

Changelog: 

merge of '3dbc4e50c575de418e1df8f965957b195aeff2ca'
     and '8e560053e153f10e0b7a2d211f7c20fbe7a2328d'

Changes against parent 3dbc4e50c575de418e1df8f965957b195aeff2ca

  patched  libpurple/account.c

Changes against parent 8e560053e153f10e0b7a2d211f7c20fbe7a2328d

  patched  ChangeLog
  patched  finch/finch.c
  patched  pidgin/gtkmain.c