pidgin: 75f0460d: merge of '20372c17661f91b48107dadf3019a7...

Tue May 27 03:21:42 EDT 2008

-----------------------------------------------------------------
Revision: 75f0460d3679231b61d572e76fe02534a597c6b5
Ancestor: 20372c17661f91b48107dadf3019a7b9123f3650
Ancestor: dfcb0eeaba14aea1a9730cb7c378aae53f4541a9
Author: sadrul at pidgin.im
Date: 2008-05-27T04:11:04
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/75f0460d3679231b61d572e76fe02534a597c6b5

Modified files:
        ChangeLog.API finch/libgnt/gntkeys.c libpurple/notify.h
        libpurple/protocols/oscar/oscar.c

ChangeLog: 

merge of '20372c17661f91b48107dadf3019a7b9123f3650'
     and 'dfcb0eeaba14aea1a9730cb7c378aae53f4541a9'