cpw.ljfisher.ssl_client_auth: aa441aa0: merge of '6ec978e7759514d22dc8c01205136c...

[lucas.fisher at gmail.com]

----------------------------------------------------------------------
Revision: aa441aa0dd6d539d89da1b72cec2a1eb9b6025f0
Parent:   6ec978e7759514d22dc8c01205136c2d0d52c7f3
Parent:   a75ce11ab29ef56e5cc0841f6365056a4af40e88
Author:   lucas.fisher at gmail.com
Date:     03/09/12 23:38:12
Branch:   im.pidgin.cpw.ljfisher.ssl_client_auth
URL: http://d.pidgin.im/viewmtn/revision/info/aa441aa0dd6d539d89da1b72cec2a1eb9b6025f0

Changelog: 

merge of '6ec978e7759514d22dc8c01205136c2d0d52c7f3'
     and 'a75ce11ab29ef56e5cc0841f6365056a4af40e88'

Changes against parent 6ec978e7759514d22dc8c01205136c2d0d52c7f3

  added    pidgin/gtkwebviewtoolbar.c
  added    pidgin/gtkwebviewtoolbar.h
  patched  COPYRIGHT
  patched  ChangeLog
  patched  ChangeLog.API
  patched  configure.ac
  patched  finch/finch.c
  patched  finch/gntnotify.c
  patched  libpurple/account.h
  patched  libpurple/accountopt.h
  patched  libpurple/blist.c
  patched  libpurple/blist.h
  patched  libpurple/buddyicon.h
  patched  libpurple/certificate.c
  patched  libpurple/certificate.h
  patched  libpurple/circbuffer.h
  patched  libpurple/cmds.c
  patched  libpurple/cmds.h
  patched  libpurple/connection.h
  patched  libpurple/conversation.c
  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.c
  patched  libpurple/network.h
  patched  libpurple/notify.h
  patched  libpurple/ntlm.h
  patched  libpurple/plugin.h
  patched  libpurple/pluginpref.h
  patched  libpurple/plugins/log_reader.c
  patched  libpurple/plugins/ssl/ssl-gnutls.c
  patched  libpurple/plugins/ssl/ssl-nss.c
  patched  libpurple/pounce.h
  patched  libpurple/prefs.h
  patched  libpurple/privacy.h
  patched  libpurple/protocols/bonjour/bonjour_ft.c
  patched  libpurple/protocols/bonjour/jabber.c
  patched  libpurple/protocols/bonjour/jabber.h
  patched  libpurple/protocols/bonjour/mdns_avahi.c
  patched  libpurple/protocols/gg/gg.c
  patched  libpurple/protocols/irc/parse.c
  patched  libpurple/protocols/jabber/auth_cyrus.c
  patched  libpurple/protocols/jabber/caps.c
  patched  libpurple/protocols/jabber/jingle/jingle.c
  patched  libpurple/protocols/jabber/jingle/rtp.c
  patched  libpurple/protocols/jabber/jingle/session.c
  patched  libpurple/protocols/msn/oim.c
  patched  libpurple/protocols/mxit/filexfer.c
  patched  libpurple/protocols/mxit/formcmds.c
  patched  libpurple/protocols/mxit/login.c
  patched  libpurple/protocols/mxit/markup.c
  patched  libpurple/protocols/novell/novell.c
  patched  libpurple/protocols/oscar/family_feedbag.c
  patched  libpurple/protocols/oscar/oscar.c
  patched  libpurple/protocols/oscar/peer.c
  patched  libpurple/protocols/oscar/userinfo.c
  patched  libpurple/protocols/oscar/util.c
  patched  libpurple/protocols/silc/ops.c
  patched  libpurple/protocols/silc/silc.c
  patched  libpurple/protocols/silc/wb.c
  patched  libpurple/protocols/yahoo/libymsg.c
  patched  libpurple/protocols/zephyr/ZRetSubs.c
  patched  libpurple/proxy.c
  patched  libpurple/proxy.h
  patched  libpurple/prpl.h
  patched  libpurple/purple-3.pc.in
  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.c
  patched  libpurple/util.h
  patched  libpurple/value.h
  patched  libpurple/whiteboard.h
  patched  libpurple/win32/libc_interface.c
  patched  libpurple/win32/libc_interface.h
  patched  libpurple/win32/libc_internal.h
  patched  libpurple/xmlnode.h
  patched  pidgin/Makefile.am
  patched  pidgin/Makefile.mingw
  patched  pidgin/gtkaccount.h
  patched  pidgin/gtkblist-theme.h
  patched  pidgin/gtkblist.c
  patched  pidgin/gtkblist.h
  patched  pidgin/gtkcellrendererexpander.h
  patched  pidgin/gtkcertmgr.c
  patched  pidgin/gtkcertmgr.h
  patched  pidgin/gtkconn.h
  patched  pidgin/gtkconv-theme.c
  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/gtkmedia.c
  patched  pidgin/gtknotify.c
  patched  pidgin/gtknotify.h
  patched  pidgin/gtkplugin.h
  patched  pidgin/gtkpluginpref.h
  patched  pidgin/gtkpounce.c
  patched  pidgin/gtkpounce.h
  patched  pidgin/gtkprefs.c
  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.c
  patched  pidgin/gtkutils.h
  patched  pidgin/gtkwebview.c
  patched  pidgin/gtkwebview.h
  patched  pidgin/gtkwhiteboard.h
  patched  pidgin/pidgin-3.pc.in
  patched  pidgin/pidgintooltip.h
  patched  pidgin/plugins/Makefile.am
  patched  pidgin/plugins/markerline.c
  patched  pidgin/plugins/vvconfig.c
  patched  pidgin/plugins/webkit.c
  patched  pidgin/smileyparser.h
  patched  pidgin/themes/Template.html
  patched  po/ChangeLog
  patched  po/de.po

Changes against parent a75ce11ab29ef56e5cc0841f6365056a4af40e88

  patched  libpurple/privatekey.h
  patched  libpurple/protocols/jabber/libxmpp.c