pidgin: 28c3d2da: merge of '6118d1117f31a7fc8db4bd5431af40...

[qulogic at pidgin.im]

----------------------------------------------------------------------
Revision: 28c3d2da674aa9cd470995ce6bd39c4434e026fe
Parent:   6118d1117f31a7fc8db4bd5431af400a7b46ff17
Parent:   b28bde636d271fd90efcba54f25ecf7af2e5331b
Author:   qulogic at pidgin.im
Date:     03/01/11 01:24:50
Branch:   im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/28c3d2da674aa9cd470995ce6bd39c4434e026fe

Changelog: 

merge of '6118d1117f31a7fc8db4bd5431af400a7b46ff17'
     and 'b28bde636d271fd90efcba54f25ecf7af2e5331b'

Changes against parent 6118d1117f31a7fc8db4bd5431af400a7b46ff17

  patched  ChangeLog
  patched  libpurple/protocols/msn/contact.c
  patched  libpurple/protocols/msn/msn.c
  patched  libpurple/protocols/msn/p2p.c
  patched  libpurple/protocols/msn/p2p.h
  patched  libpurple/protocols/msn/slpmsg.c
  patched  libpurple/protocols/msn/slpmsg_part.c
  patched  libpurple/protocols/msn/switchboard.c
  patched  libpurple/protocols/msn/user.c
  patched  pidgin/gtkblist.c
  patched  pidgin/gtkdocklet-gtk.c

Changes against parent b28bde636d271fd90efcba54f25ecf7af2e5331b

  patched  ChangeLog
  patched  ChangeLog.API
  patched  libpurple/plugins/perl/common/Conversation.xs
  patched  libpurple/protocols/msn/msn.c
  patched  libpurple/protocols/msn/session.c
  patched  libpurple/protocols/msn/user.h
  patched  libpurple/protocols/msn/userlist.c
  patched  libpurple/protocols/msn/userlist.h
  patched  libpurple/tests/test_util.c