pidgin: 2f4f593d: merge of '3b3526a039e213263905cee2579a5c...

[deryni at pidgin.im]

-----------------------------------------------------------------
Revision: 2f4f593dae7afcbb03bfccfe5db4d44697ec87ef
Ancestor: 3b3526a039e213263905cee2579a5c7e8a99e4a7
Ancestor: e62c6f638c31e0b145d389c1a61c4aaf9fae0c5f
Author: deryni at pidgin.im
Date: 2009-02-18T03:33:37
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/2f4f593dae7afcbb03bfccfe5db4d44697ec87ef

Modified files:
        Makefile.am libpurple/plugins/perl/common/Server.xs
        libpurple/util.h pidgin/plugins/xmppconsole.c

ChangeLog: 

merge of '3b3526a039e213263905cee2579a5c7e8a99e4a7'
     and 'e62c6f638c31e0b145d389c1a61c4aaf9fae0c5f'