pidgin: 951efa92: merge of '08d226d73f31ff54304b484070031a...

[qulogic at pidgin.im]

----------------------------------------------------------------------
Revision: 951efa92ea29f24db3d8d12f604ca9e149e94c96
Parent:   08d226d73f31ff54304b484070031adbae481095
Parent:   6a3d408df0ce6d4a341eaf1bc512dcc35660ed0c
Author:   qulogic at pidgin.im
Date:     08/23/11 23:16:23
Branch:   im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/951efa92ea29f24db3d8d12f604ca9e149e94c96

Changelog: 

merge of '08d226d73f31ff54304b484070031adbae481095'
     and '6a3d408df0ce6d4a341eaf1bc512dcc35660ed0c'

Changes against parent 08d226d73f31ff54304b484070031adbae481095

  patched  ChangeLog.API
  patched  finch/gntroomlist.c
  patched  libpurple/protocols/irc/irc.c
  patched  libpurple/protocols/jabber/chat.c
  patched  libpurple/protocols/mxit/actions.c
  patched  libpurple/protocols/mxit/filexfer.c
  patched  libpurple/protocols/mxit/login.c
  patched  libpurple/protocols/mxit/multimx.c
  patched  libpurple/protocols/mxit/mxit.c
  patched  libpurple/protocols/mxit/roster.c
  patched  libpurple/protocols/mxit/splashscreen.c
  patched  libpurple/protocols/mxit/voicevideo.c
  patched  libpurple/protocols/silc/chat.c
  patched  libpurple/protocols/yahoo/yahoochat.c
  patched  libpurple/roomlist.c
  patched  libpurple/roomlist.h
  patched  pidgin/gtkroomlist.c

Changes against parent 6a3d408df0ce6d4a341eaf1bc512dcc35660ed0c

  patched  libpurple/protocols/msn/sbconn.c