cpw.nader.asynclogging-3: 50b68a39: merge of 'a8c765827c481beb8d1c5ba5c89167...

[morshed.nader at gmail.com]

----------------------------------------------------------------------
Revision: 50b68a39f77e45bdb727382bbc2b60aa8d345d4a
Parent:   a8c765827c481beb8d1c5ba5c89167e15af6756a
Parent:   ce1bc7375299c883727bafa662aba46657f67d7f
Author:   morshed.nader at gmail.com
Date:     01/02/12 23:45:31
Branch:   im.pidgin.cpw.nader.asynclogging-3
URL: http://d.pidgin.im/viewmtn/revision/info/50b68a39f77e45bdb727382bbc2b60aa8d345d4a

Changelog: 

merge of 'a8c765827c481beb8d1c5ba5c89167e15af6756a'
     and 'ce1bc7375299c883727bafa662aba46657f67d7f'

Changes against parent a8c765827c481beb8d1c5ba5c89167e15af6756a

  patched  pidgin/plugins/history.c

Changes against parent ce1bc7375299c883727bafa662aba46657f67d7f

  patched  COPYRIGHT
  patched  ChangeLog
  patched  configure.ac
  patched  finch/gntnotify.c
  patched  libpurple/certificate.c
  patched  libpurple/certificate.h
  patched  libpurple/conversation.c
  patched  libpurple/network.c
  patched  libpurple/plugins/log_reader.c
  patched  libpurple/plugins/ssl/ssl-gnutls.c
  patched  libpurple/plugins/ssl/ssl-nss.c
  patched  libpurple/protocols/bonjour/jabber.c
  patched  libpurple/protocols/gg/gg.c
  patched  libpurple/protocols/jabber/caps.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/oscar.c
  patched  libpurple/protocols/oscar/peer.c
  patched  libpurple/protocols/oscar/userinfo.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  pidgin/Makefile.am
  patched  pidgin/gtkblist.c
  patched  pidgin/gtkcertmgr.c
  patched  pidgin/gtkconv.c
  patched  pidgin/gtkmedia.c
  patched  pidgin/gtknotify.c
  patched  pidgin/gtkpounce.c
  patched  pidgin/gtkprefs.c
  patched  pidgin/gtkutils.c
  patched  pidgin/gtkwebview.c
  patched  pidgin/gtkwebview.h
  patched  pidgin/plugins/Makefile.am
  patched  pidgin/plugins/markerline.c
  patched  pidgin/plugins/vvconfig.c