pidgin: b57a2fab: merge of '82b5f258a6715492617fdc4b10fbdb...

[rekkanoryo at pidgin.im]

----------------------------------------------------------------------
Revision: b57a2fabd83745a5622fe79384727baa017f7893
Parent:   82b5f258a6715492617fdc4b10fbdb1e6d502d2d
Parent:   d6123dbf76622d078959b33e7a013efcfd5af34c
Author:   rekkanoryo at pidgin.im
Date:     01/09/11 15:28:58
Branch:   im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/b57a2fabd83745a5622fe79384727baa017f7893

Changelog: 

merge of '82b5f258a6715492617fdc4b10fbdb1e6d502d2d'
     and 'd6123dbf76622d078959b33e7a013efcfd5af34c'

Changes against parent 82b5f258a6715492617fdc4b10fbdb1e6d502d2d

  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

Changes against parent d6123dbf76622d078959b33e7a013efcfd5af34c

  patched  ChangeLog
  patched  configure.ac
  patched  libpurple/util.c