pidgin: 5a775580: merge of 'ebacad33e72745d3734a3d870fee30...

[darkrain42 at pidgin.im]

-----------------------------------------------------------------
Revision: 5a775580c19958eee0160678ce54a697032041ab
Ancestor: ebacad33e72745d3734a3d870fee301705c7282c
Ancestor: f276f730c0a3584d3e8c1ee6dc1119e23809b362
Author: darkrain42 at pidgin.im
Date: 2009-07-18T00:40:40
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/5a775580c19958eee0160678ce54a697032041ab

Modified files:
        ChangeLog configure.ac
        libpurple/protocols/jabber/Makefile.am
        libpurple/protocols/jabber/jabber.c
        libpurple/protocols/jabber/jutil.c
        libpurple/protocols/jabber/jutil.h
        libpurple/protocols/yahoo/libymsg.c
        libpurple/tests/test_jabber_jutil.c

ChangeLog: 

merge of 'ebacad33e72745d3734a3d870fee301705c7282c'
     and 'f276f730c0a3584d3e8c1ee6dc1119e23809b362'