pidgin: de5074f5: merge of '229f226a4d7937c46842e33328e05f...

Sun Apr 18 17:50:18 EDT 2010

-----------------------------------------------------------------
Revision: de5074f5f3785a3e757b9ab4ed946a01ddc69944
Ancestor: 229f226a4d7937c46842e33328e05fc827bf3573
Ancestor: 56dbb07bba4460522cb38830486f96c1d361d78b
Author: qulogic at pidgin.im
Date: 2010-04-17T22:22:21
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/de5074f5f3785a3e757b9ab4ed946a01ddc69944

Modified files:
        ChangeLog.API configure.ac libpurple/network.c
        libpurple/network.h libpurple/protocols/msn/switchboard.c
        libpurple/util.c libpurple/util.h
        pidgin/plugins/ticker/gtkticker.c

ChangeLog: 

merge of '229f226a4d7937c46842e33328e05fc827bf3573'
     and '56dbb07bba4460522cb38830486f96c1d361d78b'