pidgin: 510f0e4c: merge of '837b54a614756c96003b17bffd4864...

[darkrain42 at pidgin.im]

----------------------------------------------------------------------
Revision: 510f0e4ccad1925fb150ff2c8fa08c7c1fe62549
Parent:   837b54a614756c96003b17bffd4864c0e86d651f
Parent:   f01c542dc4811778ea9ae719b9b621eff9c6350b
Author:   darkrain42 at pidgin.im
Date:     11/01/10 21:57:06
Branch:   im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/510f0e4ccad1925fb150ff2c8fa08c7c1fe62549

Changelog: 

merge of '837b54a614756c96003b17bffd4864c0e86d651f'
     and 'f01c542dc4811778ea9ae719b9b621eff9c6350b'

Changes against parent 837b54a614756c96003b17bffd4864c0e86d651f

  patched  libpurple/protocols/jabber/auth.c
  patched  libpurple/protocols/jabber/auth.h

Changes against parent f01c542dc4811778ea9ae719b9b621eff9c6350b

  dropped  libpurple/protocols/msn/dialog.c
  dropped  libpurple/protocols/msn/dialog.h
  dropped  libpurple/protocols/msn/sync.c
  dropped  libpurple/protocols/msn/sync.h
  added    libpurple/protocols/msn/p2p.c
  added    libpurple/protocols/msn/p2p.h
  added    libpurple/protocols/msn/sbconn.c
  added    libpurple/protocols/msn/sbconn.h
  added    libpurple/protocols/msn/slpmsg_part.c
  added    libpurple/protocols/msn/slpmsg_part.h
  added    libpurple/protocols/msn/xfer.c
  added    libpurple/protocols/msn/xfer.h
  patched  ChangeLog
  patched  ChangeLog.API
  patched  NEWS
  patched  configure.ac
  patched  libpurple/account.c
  patched  libpurple/protocols/msn/Makefile.am
  patched  libpurple/protocols/msn/Makefile.mingw
  patched  libpurple/protocols/msn/cmdproc.c
  patched  libpurple/protocols/msn/cmdproc.h
  patched  libpurple/protocols/msn/command.c
  patched  libpurple/protocols/msn/command.h
  patched  libpurple/protocols/msn/contact.c
  patched  libpurple/protocols/msn/directconn.c
  patched  libpurple/protocols/msn/directconn.h
  patched  libpurple/protocols/msn/error.c
  patched  libpurple/protocols/msn/error.h
  patched  libpurple/protocols/msn/group.h
  patched  libpurple/protocols/msn/history.h
  patched  libpurple/protocols/msn/httpconn.h
  patched  libpurple/protocols/msn/msg.c
  patched  libpurple/protocols/msn/msg.h
  patched  libpurple/protocols/msn/msn.c
  patched  libpurple/protocols/msn/msn.h
  patched  libpurple/protocols/msn/msnutils.c
  patched  libpurple/protocols/msn/msnutils.h
  patched  libpurple/protocols/msn/nexus.c
  patched  libpurple/protocols/msn/nexus.h
  patched  libpurple/protocols/msn/notification.c
  patched  libpurple/protocols/msn/notification.h
  patched  libpurple/protocols/msn/object.c
  patched  libpurple/protocols/msn/object.h
  patched  libpurple/protocols/msn/oim.c
  patched  libpurple/protocols/msn/servconn.c
  patched  libpurple/protocols/msn/servconn.h
  patched  libpurple/protocols/msn/session.c
  patched  libpurple/protocols/msn/session.h
  patched  libpurple/protocols/msn/slp.c
  patched  libpurple/protocols/msn/slp.h
  patched  libpurple/protocols/msn/slpcall.c
  patched  libpurple/protocols/msn/slpcall.h
  patched  libpurple/protocols/msn/slplink.c
  patched  libpurple/protocols/msn/slplink.h
  patched  libpurple/protocols/msn/slpmsg.c
  patched  libpurple/protocols/msn/slpmsg.h
  patched  libpurple/protocols/msn/state.c
  patched  libpurple/protocols/msn/state.h
  patched  libpurple/protocols/msn/switchboard.c
  patched  libpurple/protocols/msn/switchboard.h
  patched  libpurple/protocols/msn/table.h
  patched  libpurple/protocols/msn/transaction.c
  patched  libpurple/protocols/msn/transaction.h
  patched  libpurple/protocols/msn/user.c
  patched  libpurple/protocols/msn/user.h
  patched  libpurple/protocols/msn/userlist.c
  patched  libpurple/protocols/msn/userlist.h
  patched  libpurple/protocols/oscar/clientlogin.c
  patched  libpurple/protocols/oscar/oscar.c
  patched  po/ChangeLog
  patched  po/POTFILES.in