pidgin: 228441c3: merge of '0c09db333f3ff80093510065d37e0e...

[qulogic at pidgin.im]

----------------------------------------------------------------------
Revision: 228441c37661b48c2fda6b23d5b98f9982b1e6b2
Parent:   0c09db333f3ff80093510065d37e0e275499b9f1
Parent:   2b77d04bbc598fa43216d1cfbc953a5891d1eda1
Author:   qulogic at pidgin.im
Date:     12/16/10 02:20:13
Branch:   im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/228441c37661b48c2fda6b23d5b98f9982b1e6b2

Changelog: 

merge of '0c09db333f3ff80093510065d37e0e275499b9f1'
     and '2b77d04bbc598fa43216d1cfbc953a5891d1eda1'

Changes against parent 0c09db333f3ff80093510065d37e0e275499b9f1

  patched  COPYRIGHT
  patched  ChangeLog
  patched  libpurple/protocols/irc/msgs.c
  patched  libpurple/protocols/irc/parse.c
  patched  libpurple/protocols/oscar/family_locate.c
  patched  libpurple/tests/test_util.c

Changes against parent 2b77d04bbc598fa43216d1cfbc953a5891d1eda1

  patched  libpurple/protocols/msn/cmdproc.c
  patched  libpurple/protocols/msn/command.c
  patched  libpurple/protocols/msn/command.h
  patched  libpurple/protocols/msn/contact.c
  patched  libpurple/protocols/msn/contact.h
  patched  libpurple/protocols/msn/directconn.c
  patched  libpurple/protocols/msn/directconn.h
  patched  libpurple/protocols/msn/msg.c
  patched  libpurple/protocols/msn/msg.h
  patched  libpurple/protocols/msn/notification.c
  patched  libpurple/protocols/msn/oim.c
  patched  libpurple/protocols/msn/p2p.h
  patched  libpurple/protocols/msn/slplink.c
  patched  libpurple/protocols/msn/slplink.h
  patched  libpurple/protocols/msn/slpmsg.c
  patched  libpurple/protocols/msn/slpmsg_part.c
  patched  libpurple/protocols/msn/slpmsg_part.h
  patched  libpurple/protocols/msn/switchboard.c
  patched  libpurple/protocols/msn/user.c