pidgin.mxit: e287e51f: propagate from branch 'im.pidgin.pidgin'...

[andrew.victor at mxit.com]

----------------------------------------------------------------------
Revision: e287e51f3f6469ce3d64fdb6c7900c07464300ef
Parent:   06a5486dac3cd9e5c3e22b23b968e1e45274d897
Parent:   dcc8e1d14b41f29a248ddf04ed3c395eba1bcc5e
Author:   andrew.victor at mxit.com
Date:     08/04/11 10:03:51
Branch:   im.pidgin.pidgin.mxit
URL: http://d.pidgin.im/viewmtn/revision/info/e287e51f3f6469ce3d64fdb6c7900c07464300ef

Changelog: 

propagate from branch 'im.pidgin.pidgin' (head dcc8e1d14b41f29a248ddf04ed3c395eba1bcc5e)
            to branch 'im.pidgin.pidgin.mxit' (head 06a5486dac3cd9e5c3e22b23b968e1e45274d897)

Changes against parent 06a5486dac3cd9e5c3e22b23b968e1e45274d897

  patched  AUTHORS
  patched  COPYRIGHT
  patched  ChangeLog
  patched  ChangeLog.API
  patched  configure.ac
  patched  libpurple/conversation.c
  patched  libpurple/dnsquery.c
  patched  libpurple/dnssrv.c
  patched  libpurple/dnssrv.h
  patched  libpurple/plugins/log_reader.c
  patched  libpurple/prefs.c
  patched  libpurple/protocols/gg/gg.c
  patched  libpurple/protocols/gg/lib/libgadu.c
  patched  libpurple/protocols/irc/irc.c
  patched  libpurple/protocols/irc/msgs.c
  patched  libpurple/protocols/irc/parse.c
  patched  libpurple/protocols/jabber/jabber.c
  patched  libpurple/protocols/jabber/usermood.c
  patched  libpurple/protocols/msn/notification.c
  patched  libpurple/protocols/msn/slp.c
  patched  libpurple/protocols/msn/slpcall.c
  patched  libpurple/protocols/oscar/oscar.c
  patched  libpurple/protocols/sametime/sametime.c
  patched  libpurple/protocols/simple/simple.c
  patched  libpurple/upnp.c
  patched  libpurple/xmlnode.c
  patched  pidgin/gtkblist.c
  patched  pidgin/gtkconv.c
  patched  pidgin/gtkdialogs.c
  patched  pidgin/gtkdialogs.h
  patched  pidgin/gtkimhtml.c
  patched  pidgin/gtkmedia.c
  patched  pidgin/gtkprefs.c
  patched  po/de.po

Changes against parent dcc8e1d14b41f29a248ddf04ed3c395eba1bcc5e

  patched  ChangeLog
  patched  libpurple/protocols/mxit/cipher.c
  patched  libpurple/protocols/mxit/cipher.h
  patched  libpurple/protocols/mxit/markup.c
  patched  libpurple/protocols/mxit/protocol.c
  patched  libpurple/protocols/mxit/protocol.h
  patched  libpurple/protocols/mxit/roster.h