pidgin: d6123dbf: merge of '31f4ecca5814739b29ec1971173c7b...

Sun Jan 9 03:35:54 EST 2011

----------------------------------------------------------------------
Revision: d6123dbf76622d078959b33e7a013efcfd5af34c
Parent:   31f4ecca5814739b29ec1971173c7b7e2b56bcca
Parent:   539a3b8b9f11b96523e13451db703549d281d372
Author:   qulogic at pidgin.im
Date:     01/09/11 03:31:03
Branch:   im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/d6123dbf76622d078959b33e7a013efcfd5af34c

Changelog: 

merge of '31f4ecca5814739b29ec1971173c7b7e2b56bcca'
     and '539a3b8b9f11b96523e13451db703549d281d372'

Changes against parent 31f4ecca5814739b29ec1971173c7b7e2b56bcca

  patched  pidgin/gtkdialogs.c

Changes against parent 539a3b8b9f11b96523e13451db703549d281d372

  patched  libpurple/protocols/msn/directconn.c
  patched  libpurple/protocols/msn/slp.c
  patched  libpurple/protocols/msn/slpcall.c
  patched  libpurple/protocols/msn/xfer.c
  patched  libpurple/protocols/msn/xfer.h
  patched  pidgin/gtkdialogs.c