pidgin: 90da8da0: merge of '10c77c853c49f28524dabf8a514981...

Fri Jul 10 22:00:47 EDT 2009

-----------------------------------------------------------------
Revision: 90da8da01d8b8fa432adae5fd697ef4bad3582b5
Ancestor: 10c77c853c49f28524dabf8a5149818138c09c60
Ancestor: 7bc0b08014d8d13ff8ee8c61c280e4d963b578d2
Author: darkrain42 at pidgin.im
Date: 2009-07-11T01:57:47
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/90da8da01d8b8fa432adae5fd697ef4bad3582b5

Modified files:
        libpurple/protocols/jabber/jutil.c
        libpurple/protocols/jabber/jutil.h
        libpurple/tests/test_jabber_jutil.c po/POTFILES.in

ChangeLog: 

merge of '10c77c853c49f28524dabf8a5149818138c09c60'
     and '7bc0b08014d8d13ff8ee8c61c280e4d963b578d2'