pidgin: 860c1f4b: merge of '07f8d9c59020c1f69cc21b71f8252f...

Wed Jan 14 09:12:09 EST 2009

-----------------------------------------------------------------
Revision: 860c1f4ba7c32d29b1eadea96785520c9db0a162
Ancestor: 07f8d9c59020c1f69cc21b71f8252f13efd6a6e0
Ancestor: 331937f46235852e1813a1492eb351071127e02c
Author: datallah at pidgin.im
Date: 2009-01-14T13:59:46
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/860c1f4ba7c32d29b1eadea96785520c9db0a162

Modified files:
        ChangeLog configure.ac doc/finch.1.in finch/libgnt/gntbox.c
        libpurple/protocols/gg/gg.c libpurple/protocols/oscar/odc.c
        libpurple/protocols/oscar/oscar.c libpurple/prpl.c

ChangeLog: 

merge of '07f8d9c59020c1f69cc21b71f8252f13efd6a6e0'
     and '331937f46235852e1813a1492eb351071127e02c'