cpw.nader.asynclogging-3: 32d2495e: merge of '68e6abf0efaee89c0c5a9becd8df15...

[morshed.nader at gmail.com]

----------------------------------------------------------------------
Revision: 32d2495e080586a45d60c86977f7f5a91254c6f4
Parent:   68e6abf0efaee89c0c5a9becd8df159c3fe66d93
Parent:   e31dd8da50bae95052313ade60ff6e020a291080
Author:   morshed.nader at gmail.com
Date:     01/04/12 11:42:16
Branch:   im.pidgin.cpw.nader.asynclogging-3
URL: http://d.pidgin.im/viewmtn/revision/info/32d2495e080586a45d60c86977f7f5a91254c6f4

Changelog: 

merge of '68e6abf0efaee89c0c5a9becd8df159c3fe66d93'
     and 'e31dd8da50bae95052313ade60ff6e020a291080'

Changes against parent 68e6abf0efaee89c0c5a9becd8df159c3fe66d93

  patched  libpurple/commonlog.c
  patched  libpurple/commonlog.h
  patched  libpurple/htmllog.c
  patched  libpurple/log.c
  patched  libpurple/log.h
  patched  libpurple/oldlog.c
  patched  libpurple/txtlog.c

Changes against parent e31dd8da50bae95052313ade60ff6e020a291080

  patched  libpurple/htmllog.c
  patched  pidgin/plugins/history.c