cpw.rekkanoryo.icqxstatus: 7e67fade: merge of 'f14dddd03f189029f2313c234b5e9d...

Wed Feb 10 16:02:17 EST 2010

-----------------------------------------------------------------
Revision: 7e67fade1189ddc36e8d1a6560c75f19d0df32aa
Ancestor: f14dddd03f189029f2313c234b5e9dc9964b8fa8
Ancestor: f7ee01128f9373b2d98f537af9109a36acc58d1e
Author: malu at pidgin.im
Date: 2010-02-10T20:53:32
Branch: im.pidgin.cpw.rekkanoryo.icqxstatus
URL: http://d.pidgin.im/viewmtn/revision/info/7e67fade1189ddc36e8d1a6560c75f19d0df32aa

Modified files:
        libpurple/protocols/jabber/presence.c
        libpurple/protocols/oscar/oscar.h

ChangeLog: 

merge of 'f14dddd03f189029f2313c234b5e9dc9964b8fa8'
     and 'f7ee01128f9373b2d98f537af9109a36acc58d1e'