pidgin: 68f5ff90: merge of '5bc899d1d49d1b8701e547f4e4d765...

Sun Apr 18 17:50:02 EDT 2010

-----------------------------------------------------------------
Revision: 68f5ff90a6c6186840a01034f41386ee1d8558ee
Ancestor: 5bc899d1d49d1b8701e547f4e4d76519e471d339
Ancestor: a778777f714204be832f9a284e141896f41bbdb7
Author: darkrain42 at pidgin.im
Date: 2010-04-17T01:27:58
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/68f5ff90a6c6186840a01034f41386ee1d8558ee

Modified files:
        COPYRIGHT ChangeLog.API configure.ac libpurple/account.c
        libpurple/account.h libpurple/network.c libpurple/network.h
        libpurple/util.c libpurple/util.h

ChangeLog: 

merge of '5bc899d1d49d1b8701e547f4e4d76519e471d339'
     and 'a778777f714204be832f9a284e141896f41bbdb7'