pidgin: e24f300d: merge of 'bd7b70e38030da580a7bc922236ec5...

[qulogic at pidgin.im]

-----------------------------------------------------------------
Revision: e24f300de02072bb4ac5bf402a52abdc498efbce
Ancestor: bd7b70e38030da580a7bc922236ec504ecb8853b
Ancestor: c1573675765ce94fa58152c4fc2af225ff621d47
Author: qulogic at pidgin.im
Date: 2010-05-17T08:04:50
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/e24f300de02072bb4ac5bf402a52abdc498efbce

Modified files:
        doc/funniest_home_convos.txt
        libpurple/protocols/bonjour/jabber.c
        libpurple/protocols/irc/msgs.c
        libpurple/protocols/mxit/chunk.h
        libpurple/protocols/mxit/protocol.c
        libpurple/protocols/oscar/family_icbm.c libpurple/util.c
        pidgin/gtkblist.c pidgin/gtkdocklet-gtk.c
        pidgin/gtksession.c

ChangeLog: 

merge of 'bd7b70e38030da580a7bc922236ec504ecb8853b'
     and 'c1573675765ce94fa58152c4fc2af225ff621d47'