pidgin: 46435d32: merge of '637cbec3044756a8ef4273f687d84b...

Sun May 23 13:30:53 EDT 2010

-----------------------------------------------------------------
Revision: 46435d32a7a76dcc77c20251eb0d7bdf7429d76e
Ancestor: 637cbec3044756a8ef4273f687d84b18f10b05c4
Ancestor: 9e9bcdba177b1d4b1f7368101b35c65a5d1c3a65
Author: rekkanoryo at pidgin.im
Date: 2010-05-23T17:24:05
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/46435d32a7a76dcc77c20251eb0d7bdf7429d76e

Modified files:
        ChangeLog ChangeLog.win32 libpurple/protocols/qq/qq_base.c

ChangeLog: 

merge of '637cbec3044756a8ef4273f687d84b18f10b05c4'
     and '9e9bcdba177b1d4b1f7368101b35c65a5d1c3a65'