Revision 26c05ed157a02643cbb12b04045422b123312bcf

[resiak at soc.pidgin.im]

-----------------------------------------------------------------
Revision: 26c05ed157a02643cbb12b04045422b123312bcf
Ancestor: 07d5798f8a0b64518b4697e0376f5ceeddbb61e2
Ancestor: da7520dee75fbe063aa7747c5452551d0030abee
Author: resiak at soc.pidgin.im
Date: 2007-09-30T16:55:19
Branch: im.pidgin.pidgin

Modified files:
        ChangeLog configure.ac finch/gntconv.c finch/gntplugin.c
        finch/gntpounce.c finch/libgnt/pygnt/gntmodule.c
        finch/libgnt/pygnt/gnttree.override libpurple/plugin.c
        libpurple/protocols/oscar/odc.c
        libpurple/protocols/oscar/oscar.c

ChangeLog: 

merge of '07d5798f8a0b64518b4697e0376f5ceeddbb61e2'
     and 'da7520dee75fbe063aa7747c5452551d0030abee'


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