pidgin: 95ba441d: merge of '60a434545c6f61fc0f20206c0d4eb8...

Sun Mar 21 16:45:52 EDT 2010

-----------------------------------------------------------------
Revision: 95ba441d77fc560a693ae0aae28b37402bc5ec2f
Ancestor: 60a434545c6f61fc0f20206c0d4eb87a9fb8de11
Ancestor: fe69dfeac6d98c4a6864e937ab3d45f614d43dad
Author: qulogic at pidgin.im
Date: 2010-03-21T20:40:17
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/95ba441d77fc560a693ae0aae28b37402bc5ec2f

Modified files:
        ChangeLog Makefile.am configure.ac
        libpurple/gconf/Makefile.am
        libpurple/protocols/jabber/data.c
        libpurple/protocols/jabber/data.h
        libpurple/protocols/jabber/message.c

ChangeLog: 

merge of '60a434545c6f61fc0f20206c0d4eb87a9fb8de11'
     and 'fe69dfeac6d98c4a6864e937ab3d45f614d43dad'