cpw.nader.asynclogging-3: 7ed239bf: merge of '50b68a39f77e45bdb727382bbc2b60...

[morshed.nader at gmail.com]

----------------------------------------------------------------------
Revision: 7ed239bff5689de50495f7082e6ac7a9538c363f
Parent:   50b68a39f77e45bdb727382bbc2b60aa8d345d4a
Parent:   a517b73241843b2f3bd4dc5a15504a99fcd9ad2d
Author:   morshed.nader at gmail.com
Date:     01/02/12 23:53:34
Branch:   im.pidgin.cpw.nader.asynclogging-3
URL: http://d.pidgin.im/viewmtn/revision/info/7ed239bff5689de50495f7082e6ac7a9538c363f

Changelog: 

merge of '50b68a39f77e45bdb727382bbc2b60aa8d345d4a'
     and 'a517b73241843b2f3bd4dc5a15504a99fcd9ad2d'

Changes against parent 50b68a39f77e45bdb727382bbc2b60aa8d345d4a

  patched  libpurple/commonlog.c
  patched  libpurple/commonlog.h

Changes against parent a517b73241843b2f3bd4dc5a15504a99fcd9ad2d

  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