Revision 707c869753d1c3704a47f994a164f3fbdebe9b58

[markdoliner at pidgin.im]

-----------------------------------------------------------------
Revision: 707c869753d1c3704a47f994a164f3fbdebe9b58
Ancestor: 3d3413c72d837a38e71907dab714b6b4ddd4a5af
Ancestor: e4a4828b90bf84ab1080455e29ac8770e0276211
Author: markdoliner at pidgin.im
Date: 2007-08-07T06:45:23
Branch: im.pidgin.pidgin

Modified files:
        Doxyfile.in libpurple/conversation.c pidgin/pidginstock.c
        pidgin/pixmaps/Makefile.am

ChangeLog: 

merge of '3d3413c72d837a38e71907dab714b6b4ddd4a5af'
     and 'e4a4828b90bf84ab1080455e29ac8770e0276211'


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