cpw.nader.asynclogging-3: a8c76582: merge of '982507d00201b03d3874b58c6d23a2...

[morshed.nader at gmail.com]

----------------------------------------------------------------------
Revision: a8c765827c481beb8d1c5ba5c89167e15af6756a
Parent:   982507d00201b03d3874b58c6d23a21cfe1c5afc
Parent:   d0e7e17265baa824e9ad6ca06ed0e8212553ece1
Author:   morshed.nader at gmail.com
Date:     01/02/12 18:42:57
Branch:   im.pidgin.cpw.nader.asynclogging-3
URL: http://d.pidgin.im/viewmtn/revision/info/a8c765827c481beb8d1c5ba5c89167e15af6756a

Changelog: 

merge of '982507d00201b03d3874b58c6d23a21cfe1c5afc'
     and 'd0e7e17265baa824e9ad6ca06ed0e8212553ece1'

Changes against parent 982507d00201b03d3874b58c6d23a21cfe1c5afc

  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

Changes against parent d0e7e17265baa824e9ad6ca06ed0e8212553ece1

  patched  Makefile.mingw
  patched  libpurple/commonlog.c
  patched  libpurple/htmllog.c
  patched  libpurple/log.c
  patched  libpurple/log.h
  patched  libpurple/plugins/Makefile.mingw
  patched  libpurple/win32/global.mak
  patched  pidgin/Makefile.mingw
  patched  pidgin/gtklog.c
  patched  pidgin/gtklog.h
  patched  pidgin/plugins/Makefile.mingw
  patched  pidgin/win32/nsis/generate_gtk_zip.sh