pidgin: 4037e908: merge of '500604b1f22bc5f32a818dc80bbc25...

[sadrul at pidgin.im]

-----------------------------------------------------------------
Revision: 4037e908f8c3536d50d9439ec2eec0f4d6ee3b60
Ancestor: 500604b1f22bc5f32a818dc80bbc252bc460dc85
Ancestor: 8538a2f807d6d671d1896aa0ad6be0d3a07c4035
Author: sadrul at pidgin.im
Date: 2008-06-18T03:27:05
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/4037e908f8c3536d50d9439ec2eec0f4d6ee3b60

Modified files:
        configure.ac finch/gntconv.c libpurple/blist.h
        libpurple/cmds.h libpurple/connection.h
        libpurple/conversation.h libpurple/core.h libpurple/log.c
        libpurple/nat-pmp.c libpurple/protocols/gg/search.h
        libpurple/protocols/jabber/jabber.c
        libpurple/protocols/jabber/libxmpp.c
        libpurple/protocols/jabber/pep.h
        libpurple/protocols/jabber/si.c
        libpurple/protocols/jabber/si.h
        libpurple/protocols/myspace/user.c
        libpurple/protocols/oscar/oscar.c
        libpurple/protocols/qq/send_file.c
        libpurple/protocols/simple/simple.c libpurple/prpl.h
        libpurple/roomlist.h libpurple/sound.h libpurple/util.c
        pidgin/plugins/cap/cap.c po/en_GB.po

ChangeLog: 

merge of '500604b1f22bc5f32a818dc80bbc252bc460dc85'
     and '8538a2f807d6d671d1896aa0ad6be0d3a07c4035'