pidgin: 9aece8b3: merge of '86a5f47962135f70129fec6720614b...

[rekkanoryo at pidgin.im]

----------------------------------------------------------------------
Revision: 9aece8b3ee2704923f4d4c2395e9ea0a10cb2116
Parent:   86a5f47962135f70129fec6720614b66a7b08532
Parent:   b5a241943187497bbbdc81af15bcbe029ac2b2dc
Author:   rekkanoryo at pidgin.im
Date:     10/18/10 23:11:12
Branch:   im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/9aece8b3ee2704923f4d4c2395e9ea0a10cb2116

Changelog: 

merge of '86a5f47962135f70129fec6720614b66a7b08532'
     and 'b5a241943187497bbbdc81af15bcbe029ac2b2dc'

Changes against parent 86a5f47962135f70129fec6720614b66a7b08532

  patched  ChangeLog
  patched  libpurple/ntlm.c
  patched  libpurple/plugins/perl/common/Util.xs
  patched  libpurple/protocols/jabber/auth_digest_md5.c
  patched  libpurple/protocols/msn/slp.c
  patched  libpurple/protocols/myspace/message.c
  patched  libpurple/protocols/oscar/clientlogin.c
  patched  libpurple/protocols/qq/im.c
  patched  libpurple/protocols/yahoo/libymsg.c
  patched  po/stats.pl
  patched  po/zh_HK.po
  patched  po/zh_TW.po

Changes against parent b5a241943187497bbbdc81af15bcbe029ac2b2dc

  patched  libpurple/protocols/oscar/Makefile.am
  patched  po/fr.po
  patched  po/uk.po