pidgin: 658dec4b: merge of '5aacaf467359c75ac94de8b4a1897a...

[malu at pidgin.im]

----------------------------------------------------------------------
Revision: 658dec4bffd7db63f292d7659d354f4f1a135a0c
Parent:   5aacaf467359c75ac94de8b4a1897a191bc2a261
Parent:   5cf492b57fa4a297212cbaa711deb42e1e431a08
Author:   malu at pidgin.im
Date:     07/07/10 16:06:35
Branch:   im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/658dec4bffd7db63f292d7659d354f4f1a135a0c

Changelog: 

merge of '5aacaf467359c75ac94de8b4a1897a191bc2a261'
     and '5cf492b57fa4a297212cbaa711deb42e1e431a08'

Changes against parent 5aacaf467359c75ac94de8b4a1897a191bc2a261

  patched  ChangeLog
  patched  ChangeLog.API
  patched  Makefile.am
  patched  configure.ac
  patched  finch/gntaccount.c
  patched  finch/gntrequest.c
  patched  finch/gntsound.c
  patched  finch/libgnt/configure.ac
  patched  finch/libgnt/gntcombobox.c
  patched  finch/libgnt/gnttree.c
  patched  finch/libgnt/gnttree.h
  patched  finch/libgnt/gntutils.c
  patched  libpurple/Makefile.am
  patched  libpurple/plugins/Makefile.mingw
  patched  libpurple/protocols/msn/slplink.c
  patched  libpurple/protocols/oscar/oscar.c
  patched  libpurple/protocols/oscar/util.c
  patched  pidgin/gtkimhtmltoolbar.c
  patched  pidgin/plugins/Makefile.mingw

Changes against parent 5cf492b57fa4a297212cbaa711deb42e1e431a08

  patched  ChangeLog
  patched  pidgin/gtkmedia.c