pidgin: cfa2120b: merge of '8512af37c7822c68f1cf46a02cbca5...

[qulogic at pidgin.im]

----------------------------------------------------------------------
Revision: cfa2120bb1d7c408937f3075c018fb10c1e6eefa
Parent:   8512af37c7822c68f1cf46a02cbca592f6c79468
Parent:   dc05140f38c2811411a326665b3a2ebb1abeb51a
Author:   qulogic at pidgin.im
Date:     06/24/11 02:54:33
Branch:   im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/cfa2120bb1d7c408937f3075c018fb10c1e6eefa

Changelog: 

merge of '8512af37c7822c68f1cf46a02cbca592f6c79468'
     and 'dc05140f38c2811411a326665b3a2ebb1abeb51a'

Changes against parent 8512af37c7822c68f1cf46a02cbca592f6c79468

  patched  ChangeLog
  patched  ChangeLog.API
  patched  configure.ac
  patched  pidgin/gtkaccount.c
  patched  pidgin/gtkblist.c
  patched  pidgin/gtkconv.c
  patched  pidgin/gtkdialogs.c
  patched  pidgin/gtkft.c
  patched  pidgin/gtkimhtml.c
  patched  pidgin/gtkmain.c
  patched  pidgin/gtkprefs.c
  patched  pidgin/gtkrequest.c
  patched  pidgin/gtksmiley.c
  patched  pidgin/gtkstatusbox.c
  patched  pidgin/gtkutils.c
  patched  pidgin/gtkutils.h
  patched  po/ChangeLog

Changes against parent dc05140f38c2811411a326665b3a2ebb1abeb51a

  added    libpurple/tests/test_xmlnode.c
  patched  ChangeLog
  patched  libpurple/protocols/gg/gg.c
  patched  libpurple/tests/Makefile.am
  patched  libpurple/tests/check_libpurple.c
  patched  libpurple/tests/tests.h