pidgin: 61d125ff: merge of '2872bcba5019558c0d77e8cf9b4380...

[rekkanoryo at pidgin.im]

----------------------------------------------------------------------
Revision: 61d125ffe528ca50e39e96aeaf3ca199443783c1
Parent:   2872bcba5019558c0d77e8cf9b43801167e5efc8
Parent:   3cb4024617c6b97a4c383ddcabe7f047af92f68c
Author:   rekkanoryo at pidgin.im
Date:     10/20/10 23:53:37
Branch:   im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/61d125ffe528ca50e39e96aeaf3ca199443783c1

Changelog: 

merge of '2872bcba5019558c0d77e8cf9b43801167e5efc8'
     and '3cb4024617c6b97a4c383ddcabe7f047af92f68c'

Changes against parent 2872bcba5019558c0d77e8cf9b43801167e5efc8

  patched  libpurple/protocols/oscar/oscar.c
  patched  po/de.po

Changes against parent 3cb4024617c6b97a4c383ddcabe7f047af92f68c

  patched  ChangeLog
  patched  ChangeLog.API
  patched  NEWS
  patched  configure.ac
  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/ChangeLog
  patched  po/he.po
  patched  po/pl.po
  patched  po/stats.pl
  patched  po/zh_HK.po
  patched  po/zh_TW.po