Revision e601ebdd94cff16d6ca584394217a48567b213d8

[markdoliner at pidgin.im]

-----------------------------------------------------------------
Revision: e601ebdd94cff16d6ca584394217a48567b213d8
Ancestor: 15fd625e20fae56881c7c728a6533fd1699c351c
Ancestor: 3829f989342d787500e9abe363c89909db102f4b
Author: markdoliner at pidgin.im
Date: 2007-09-30T00:37:03
Branch: im.pidgin.pidgin

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

ChangeLog: 

merge of '15fd625e20fae56881c7c728a6533fd1699c351c'
     and '3829f989342d787500e9abe363c89909db102f4b'


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