pidgin.mxit: 06a5486d: propagate from branch 'im.pidgin.pidgin'...

[andrew.victor at mxit.com]

----------------------------------------------------------------------
Revision: 06a5486dac3cd9e5c3e22b23b968e1e45274d897
Parent:   33a3e1b908ecb4b95c19fca0ccc93d4eca2bb26a
Parent:   7d47164033af43b2b36ed2cd8180d699c8027b6d
Author:   andrew.victor at mxit.com
Date:     08/04/11 09:52:16
Branch:   im.pidgin.pidgin.mxit
URL: http://d.pidgin.im/viewmtn/revision/info/06a5486dac3cd9e5c3e22b23b968e1e45274d897

Changelog: 

propagate from branch 'im.pidgin.pidgin' (head 33a3e1b908ecb4b95c19fca0ccc93d4eca2bb26a)
            to branch 'im.pidgin.pidgin.mxit' (head 7d47164033af43b2b36ed2cd8180d699c8027b6d)

Changes against parent 33a3e1b908ecb4b95c19fca0ccc93d4eca2bb26a

  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

Changes against parent 7d47164033af43b2b36ed2cd8180d699c8027b6d

  added    libpurple/tests/test_xmlnode.c
  patched  ChangeLog
  patched  ChangeLog.API
  patched  configure.ac
  patched  libpurple/conversation.c
  patched  libpurple/conversation.h
  patched  libpurple/protocols/gg/gg.c
  patched  libpurple/protocols/irc/irc.c
  patched  libpurple/protocols/irc/irc.h
  patched  libpurple/protocols/jabber/jabber.c
  patched  libpurple/tests/Makefile.am
  patched  libpurple/tests/check_libpurple.c
  patched  libpurple/tests/tests.h
  patched  libpurple/value.h
  patched  pidgin/gtkaccount.c
  patched  pidgin/gtkblist.c
  patched  pidgin/gtkconv.c
  patched  pidgin/gtkdialogs.c
  patched  pidgin/gtkft.c
  patched  pidgin/gtkimhtml.c
  patched  pidgin/gtkmain.c
  patched  pidgin/gtkprefs.c
  patched  pidgin/gtkrequest.c
  patched  pidgin/gtksmiley.c
  patched  pidgin/gtkstatusbox.c
  patched  pidgin/gtkutils.c
  patched  pidgin/gtkutils.h
  patched  po/ChangeLog
  patched  po/de.po