pidgin: 3dbc4e50: merge of '3a12ece5b629e6de76faec79315514...

[darkrain42 at pidgin.im]

----------------------------------------------------------------------
Revision: 3dbc4e50c575de418e1df8f965957b195aeff2ca
Parent:   3a12ece5b629e6de76faec79315514e70ccb32bb
Parent:   4fdc7756ef147546eab68685a5d86c4b6db44a11
Author:   darkrain42 at pidgin.im
Date:     06/20/11 01:53:59
Branch:   im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/3dbc4e50c575de418e1df8f965957b195aeff2ca

Changelog: 

merge of '3a12ece5b629e6de76faec79315514e70ccb32bb'
     and '4fdc7756ef147546eab68685a5d86c4b6db44a11'

Changes against parent 3a12ece5b629e6de76faec79315514e70ccb32bb

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

Changes against parent 4fdc7756ef147546eab68685a5d86c4b6db44a11

  patched  libpurple/account.c