Revision 3e1b2cd04330abe92d78decb69cdb750b1827953

[sadrul at pidgin.im]

-----------------------------------------------------------------
Revision: 3e1b2cd04330abe92d78decb69cdb750b1827953
Ancestor: c51336971442c17c683e99ca9e7d1f16f839e488
Ancestor: ca5bc719bc984cb13992e9bbe435c54f5ea982a7
Author: sadrul at pidgin.im
Date: 2007-06-16T21:23:24
Branch: im.pidgin.pidgin

Modified files:
        libpurple/protocols/jabber/iq.c
        libpurple/protocols/oscar/oscar.c

ChangeLog: 

merge of 'c51336971442c17c683e99ca9e7d1f16f839e488'
     and 'ca5bc719bc984cb13992e9bbe435c54f5ea982a7'


To get the patch for this revision, please do this:
mtn log --last 1 --diffs --from 3e1b2cd04330abe92d78decb69cdb750b1827953