pidgin: 1d71761f: merge of 'df25bed2c1c0d097b7f52fbfae7622...

Thu May 7 22:45:34 EDT 2009

-----------------------------------------------------------------
Revision: 1d71761f5d4a09d42e911fd9449a205da0d4b951
Ancestor: df25bed2c1c0d097b7f52fbfae76223d8552f0c3
Ancestor: f16d13c3e5a15443b2bfb4f84c34e9b9a8e28850
Author: darkrain42 at pidgin.im
Date: 2009-05-08T02:42:13
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/1d71761f5d4a09d42e911fd9449a205da0d4b951

Modified files:
        ChangeLog libpurple/protocols/jabber/buddy.c
        libpurple/protocols/jabber/caps.c
        libpurple/protocols/jabber/caps.h
        libpurple/protocols/jabber/presence.c

ChangeLog: 

merge of 'df25bed2c1c0d097b7f52fbfae76223d8552f0c3'
     and 'f16d13c3e5a15443b2bfb4f84c34e9b9a8e28850'