pidgin: dfcb0eea: merge of 'd5bcb8334771f0dbd5870944a8eec8...

Mon May 26 23:50:58 EDT 2008

-----------------------------------------------------------------
Revision: dfcb0eeaba14aea1a9730cb7c378aae53f4541a9
Ancestor: d5bcb8334771f0dbd5870944a8eec88f586e0fd0
Ancestor: e7b26e4ad289cb60bb72e4ddb99a5a93c1fbefc9
Author: evands at pidgin.im
Date: 2008-05-27T03:47:16
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/dfcb0eeaba14aea1a9730cb7c378aae53f4541a9

Modified files:
        finch/libgnt/gntkeys.c libpurple/protocols/oscar/oscar.c

ChangeLog: 

merge of 'd5bcb8334771f0dbd5870944a8eec88f586e0fd0'
     and 'e7b26e4ad289cb60bb72e4ddb99a5a93c1fbefc9'