pidgin: cfa8bcce: merge of '994f8bdccfcf73a73924e593d2c398...

Wed May 14 01:02:50 EDT 2008

-----------------------------------------------------------------
Revision: cfa8bcce1dfa952cf5b50a0d15e1e15a63d1f120
Ancestor: 994f8bdccfcf73a73924e593d2c398c8d416e5e9
Ancestor: e1c49c9ec5c6869ed9813feccd8ee41d2ca40f35
Author: khc at pidgin.im
Date: 2008-05-14T04:58:36
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/cfa8bcce1dfa952cf5b50a0d15e1e15a63d1f120

Modified files:
        configure.ac libpurple/protocols/msn/oim.c pidgin/gtkblist.c

ChangeLog: 

merge of '994f8bdccfcf73a73924e593d2c398c8d416e5e9'
     and 'e1c49c9ec5c6869ed9813feccd8ee41d2ca40f35'