pidgin: 0eccb8ce: merge of '99687ce6fa955d1d32092992b65de1...

[kstange at pidgin.im]

-----------------------------------------------------------------
Revision: 0eccb8cefd5975eeab1d14984f2f0114ce7abb79
Ancestor: 99687ce6fa955d1d32092992b65de140dc944ab0
Ancestor: d26b1eaa92aaac0a6de151a429c6b7a3bf5bd241
Author: kstange at pidgin.im
Date: 2008-05-10T05:20:29
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/0eccb8cefd5975eeab1d14984f2f0114ce7abb79

Modified files:
        AUTHORS libpurple/network.c pidgin/gtkdialogs.c

ChangeLog: 

merge of '99687ce6fa955d1d32092992b65de140dc944ab0'
     and 'd26b1eaa92aaac0a6de151a429c6b7a3bf5bd241'