pidgin: 7e83d40b: merge of '21f078cdce656c60707d6518904262...

Mon Sep 5 15:10:49 EDT 2011

----------------------------------------------------------------------
Revision: 7e83d40baa440a08e5555c3fd790fbb05f9e606a
Parent:   21f078cdce656c60707d6518904262ee44ac648c
Parent:   b4fc734e44f103a918a1a34ad16d57bf4a40ef16
Author:   andrew.victor at mxit.com
Date:     09/03/11 07:51:24
Branch:   im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/7e83d40baa440a08e5555c3fd790fbb05f9e606a

Changelog: 

merge of '21f078cdce656c60707d6518904262ee44ac648c'
     and 'b4fc734e44f103a918a1a34ad16d57bf4a40ef16'

Changes against parent 21f078cdce656c60707d6518904262ee44ac648c

  patched  libpurple/protocols/bonjour/mdns_win32.c
  patched  libpurple/protocols/myspace/user.c

Changes against parent b4fc734e44f103a918a1a34ad16d57bf4a40ef16

  patched  ChangeLog.API
  patched  libpurple/plugin.c
  patched  libpurple/plugin.h
  patched  libpurple/protocols/msn/msg.c
  patched  libpurple/protocols/msn/msn.c
  patched  libpurple/protocols/msn/object.c
  patched  libpurple/protocols/msn/object.h
  patched  libpurple/protocols/msn/slpcall.c
  patched  libpurple/protocols/msn/user.c
  patched  libpurple/xmlnode.c
  patched  libpurple/xmlnode.h