Revision 83e116941359b2b0422575bd08ca0c7c582162c4

[evands at pidgin.im]

-----------------------------------------------------------------
Revision: 83e116941359b2b0422575bd08ca0c7c582162c4
Ancestor: 45c1f04f71cf4ccbd70b37318474175c0cd4d0a9
Ancestor: 7f6aca10dadc1d0a7dbbf6abc0d31311c53d0d70
Author: evands at pidgin.im
Date: 2007-05-05T18:14:48
Branch: im.pidgin.pidgin

Modified files:
        ChangeLog configure.ac doc/funniest_home_convos.txt
        finch/finch.c finch/gntconv.c finch/libgnt/gntentry.c
        finch/libgnt/gntmain.c libpurple/protocols/jabber/message.c
        libpurple/protocols/oscar/family_feedbag.c
        libpurple/protocols/oscar/oscar.c pidgin/Makefile.am
        pidgin/gtkblist.c pidgin/gtksound.c

ChangeLog: 

merge of '45c1f04f71cf4ccbd70b37318474175c0cd4d0a9'
     and '7f6aca10dadc1d0a7dbbf6abc0d31311c53d0d70'


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