Revision 07d5798f8a0b64518b4697e0376f5ceeddbb61e2

[resiak at soc.pidgin.im]

-----------------------------------------------------------------
Revision: 07d5798f8a0b64518b4697e0376f5ceeddbb61e2
Ancestor: c966d1b59a11c860df756f5def6e3486d94f24e3
Ancestor: e601ebdd94cff16d6ca584394217a48567b213d8
Author: resiak at soc.pidgin.im
Date: 2007-09-30T16:55:15
Branch: im.pidgin.pidgin

Modified files:
        ChangeLog libpurple/protocols/oscar/odc.c
        libpurple/protocols/oscar/oscar.c

ChangeLog: 

merge of 'c966d1b59a11c860df756f5def6e3486d94f24e3'
     and 'e601ebdd94cff16d6ca584394217a48567b213d8'


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