pidgin: eb525fc0: merge of '657be692e8fe314ef25624dc2b70d2...

[datallah at pidgin.im]

-----------------------------------------------------------------
Revision: eb525fc0d3f2a7f9440a85781c0fcdda9aafe6b5
Ancestor: 657be692e8fe314ef25624dc2b70d25e1cf8085b
Ancestor: f34420097faff83cee26133ba8bd05198e56db0a
Author: datallah at pidgin.im
Date: 2008-05-13T18:56:11
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/eb525fc0d3f2a7f9440a85781c0fcdda9aafe6b5

Modified files:
        finch/gntsound.c libpurple/protocols/simple/simple.c
        pidgin/plugins/history.c

ChangeLog: 

merge of '657be692e8fe314ef25624dc2b70d25e1cf8085b'
     and 'f34420097faff83cee26133ba8bd05198e56db0a'