pidgin: b0e0a157: merge of '1ce90eeff222690b47ecfe394e1184...

[rekkanoryo at pidgin.im]

----------------------------------------------------------------------
Revision: b0e0a157ef45ebe1f734466149a1b3ea61885b40
Parent:   1ce90eeff222690b47ecfe394e118403b2782a2f
Parent:   54e7873c4e78229f13e9d60f11a6e65a96bbd9dd
Author:   rekkanoryo at pidgin.im
Date:     02/12/11 11:22:06
Branch:   im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/b0e0a157ef45ebe1f734466149a1b3ea61885b40

Changelog: 

merge of '1ce90eeff222690b47ecfe394e118403b2782a2f'
     and '54e7873c4e78229f13e9d60f11a6e65a96bbd9dd'

Changes against parent 1ce90eeff222690b47ecfe394e118403b2782a2f

  patched  ChangeLog
  patched  ChangeLog.API
  patched  NEWS
  patched  configure.ac

Changes against parent 54e7873c4e78229f13e9d60f11a6e65a96bbd9dd

  patched  libpurple/protocols/gg/lib/libgadu.h