pidgin: a07b7bfd: merge of '3afac25cbbb20ab81fe5ab388a8e52...

[andrew.victor at mxit.com]

----------------------------------------------------------------------
Revision: a07b7bfd5f979c74126ebea4f86249f24ff00dfd
Parent:   3afac25cbbb20ab81fe5ab388a8e529090591d60
Parent:   8bd5778e33d263e8e406320a39f876d87c7534a5
Author:   andrew.victor at mxit.com
Date:     01/09/12 06:31:00
Branch:   im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/a07b7bfd5f979c74126ebea4f86249f24ff00dfd

Changelog: 

merge of '3afac25cbbb20ab81fe5ab388a8e529090591d60'
     and '8bd5778e33d263e8e406320a39f876d87c7534a5'

Changes against parent 3afac25cbbb20ab81fe5ab388a8e529090591d60

  patched  libpurple/protocols/jabber/caps.c

Changes against parent 8bd5778e33d263e8e406320a39f876d87c7534a5

  patched  finch/finch.c
  patched  libpurple/account.h
  patched  libpurple/accountopt.h
  patched  libpurple/blist.h
  patched  libpurple/buddyicon.h
  patched  libpurple/certificate.h
  patched  libpurple/circbuffer.h
  patched  libpurple/cmds.h
  patched  libpurple/connection.h
  patched  libpurple/conversation.h
  patched  libpurple/core.h
  patched  libpurple/dbus-bindings.h
  patched  libpurple/dbus-useful.h
  patched  libpurple/debug.h
  patched  libpurple/dnsquery.h
  patched  libpurple/dnssrv.h
  patched  libpurple/eventloop.h
  patched  libpurple/ft.h
  patched  libpurple/idle.h
  patched  libpurple/imgstore.h
  patched  libpurple/log.h
  patched  libpurple/media-gst.h
  patched  libpurple/media.h
  patched  libpurple/mediamanager.h
  patched  libpurple/mime.h
  patched  libpurple/nat-pmp.h
  patched  libpurple/network.h
  patched  libpurple/notify.h
  patched  libpurple/ntlm.h
  patched  libpurple/plugin.h
  patched  libpurple/pluginpref.h
  patched  libpurple/pounce.h
  patched  libpurple/prefs.h
  patched  libpurple/privacy.h
  patched  libpurple/protocols/jabber/auth_cyrus.c
  patched  libpurple/proxy.h
  patched  libpurple/prpl.h
  patched  libpurple/request.h
  patched  libpurple/roomlist.h
  patched  libpurple/savedstatuses.h
  patched  libpurple/server.h
  patched  libpurple/signals.h
  patched  libpurple/smiley.h
  patched  libpurple/sound.h
  patched  libpurple/sslconn.h
  patched  libpurple/status.h
  patched  libpurple/stringref.h
  patched  libpurple/stun.h
  patched  libpurple/upnp.h
  patched  libpurple/util.h
  patched  libpurple/value.h
  patched  libpurple/whiteboard.h
  patched  libpurple/xmlnode.h
  patched  pidgin/gtkaccount.h
  patched  pidgin/gtkblist-theme.h
  patched  pidgin/gtkblist.h
  patched  pidgin/gtkcellrendererexpander.h
  patched  pidgin/gtkcertmgr.h
  patched  pidgin/gtkconn.h
  patched  pidgin/gtkconv.c
  patched  pidgin/gtkconv.h
  patched  pidgin/gtkconvwin.h
  patched  pidgin/gtkdebug.h
  patched  pidgin/gtkdialogs.h
  patched  pidgin/gtkdnd-hints.h
  patched  pidgin/gtkdocklet.h
  patched  pidgin/gtkeventloop.h
  patched  pidgin/gtkft.h
  patched  pidgin/gtkidle.h
  patched  pidgin/gtkimhtml.h
  patched  pidgin/gtkimhtmltoolbar.h
  patched  pidgin/gtklog.h
  patched  pidgin/gtkmain.c
  patched  pidgin/gtknotify.h
  patched  pidgin/gtkplugin.h
  patched  pidgin/gtkpluginpref.h
  patched  pidgin/gtkpounce.h
  patched  pidgin/gtkprefs.h
  patched  pidgin/gtkprivacy.h
  patched  pidgin/gtkrequest.h
  patched  pidgin/gtkroomlist.h
  patched  pidgin/gtksavedstatuses.h
  patched  pidgin/gtksession.h
  patched  pidgin/gtksmiley.h
  patched  pidgin/gtksound.h
  patched  pidgin/gtksourceundomanager.h
  patched  pidgin/gtkthemes.h
  patched  pidgin/gtkutils.h
  patched  pidgin/gtkwebview.c
  patched  pidgin/gtkwebview.h
  patched  pidgin/gtkwhiteboard.h
  patched  pidgin/pidgintooltip.h
  patched  pidgin/plugins/webkit.c
  patched  pidgin/smileyparser.h
  patched  pidgin/themes/Template.html