pidgin: 919a35da: merge of '80c06f6950b5ea3ca311d8e4752ad5...

[darkrain42 at pidgin.im]

-----------------------------------------------------------------
Revision: 919a35dac828a0687db4c920aa61da30e16d17e7
Ancestor: 80c06f6950b5ea3ca311d8e4752ad5b19ea84059
Ancestor: e51813f1e6fd21732acaaaa95d22ab3ac75a0c72
Author: darkrain42 at pidgin.im
Date: 2009-08-01T02:59:31
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/919a35dac828a0687db4c920aa61da30e16d17e7

Modified files:
        libpurple/protocols/jabber/buddy.c
        libpurple/protocols/jabber/disco.c
        libpurple/protocols/jabber/jabber.c
        libpurple/protocols/jabber/jabber.h
        libpurple/protocols/jabber/useravatar.c
        libpurple/protocols/yahoo/util.c
        libpurple/tests/test_yahoo_util.c

ChangeLog: 

merge of '80c06f6950b5ea3ca311d8e4752ad5b19ea84059'
     and 'e51813f1e6fd21732acaaaa95d22ab3ac75a0c72'