pidgin: 13a2e99b: merge of '36948cfc8a90e3d81db3b233f7af33...

Sun Jul 12 22:20:26 EDT 2009

-----------------------------------------------------------------
Revision: 13a2e99b338b6f766d19c7ad7cce26b8b32c9e99
Ancestor: 36948cfc8a90e3d81db3b233f7af33bf653ae4d3
Ancestor: 80c512a73e4585cbb038dbf493be0183ad2547bf
Author: rekkanoryo at pidgin.im
Date: 2009-07-13T02:17:47
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/13a2e99b338b6f766d19c7ad7cce26b8b32c9e99

Modified files:
        configure.ac finch/gntconv.c
        libpurple/protocols/yahoo/Makefile.am

ChangeLog: 

merge of '36948cfc8a90e3d81db3b233f7af33bf653ae4d3'
     and '80c512a73e4585cbb038dbf493be0183ad2547bf'