pidgin: 7815e658: merge of '0eccb8cefd5975eeab1d14984f2f01...

[kstange at pidgin.im]

-----------------------------------------------------------------
Revision: 7815e65846615c3c0be3764a6335b1bbad492ba5
Ancestor: 0eccb8cefd5975eeab1d14984f2f0114ce7abb79
Ancestor: e5bed926001291c25b29f85a8ab39b8297a215da
Author: kstange at pidgin.im
Date: 2008-05-10T05:21:21
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/7815e65846615c3c0be3764a6335b1bbad492ba5

Modified files:
        libpurple/network.c pidgin/pixmaps/logo.png

ChangeLog: 

merge of '0eccb8cefd5975eeab1d14984f2f0114ce7abb79'
     and 'e5bed926001291c25b29f85a8ab39b8297a215da'