pidgin: cbbfd102: merge of '479fd75025803f01e743b5c39e6706...

[sadrul at pidgin.im]

-----------------------------------------------------------------
Revision: cbbfd102a2eefcff0aac80c8fb318727a5943c21
Ancestor: 479fd75025803f01e743b5c39e6706b1d42a3520
Ancestor: f5f0cca8a5f385b7c637236b48aceef1aaa97899
Author: sadrul at pidgin.im
Date: 2009-01-06T22:41:16
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/cbbfd102a2eefcff0aac80c8fb318727a5943c21

Modified files:
        COPYRIGHT finch/libgnt/gntmain.c finch/libgnt/gnttree.c
        finch/libgnt/gntwindow.c finch/libgnt/gntwm.c
        finch/libgnt/wms/irssi.c libpurple/dbus-server.c
        libpurple/dnsquery.c libpurple/ft.c libpurple/plugin.c
        libpurple/protocols/myspace/myspace.c
        libpurple/protocols/novell/novell.c
        libpurple/protocols/oscar/oscar.c
        libpurple/protocols/oscar/peer.c po/ca.po po/ca at valencia.po
        po/de.po

ChangeLog: 

merge of '479fd75025803f01e743b5c39e6706b1d42a3520'
     and 'f5f0cca8a5f385b7c637236b48aceef1aaa97899'