pidgin: 7b531a1a: merge of '06b53ea832679e0dfb2e6d5d0c1b69...

[markdoliner at pidgin.im]

-----------------------------------------------------------------
Revision: 7b531a1a6399a190c10642d470a45c406cb62374
Ancestor: 06b53ea832679e0dfb2e6d5d0c1b69e61f1bd38b
Ancestor: ea2f92f486297b27994d3652e14f799eb0964834
Author: markdoliner at pidgin.im
Date: 2009-11-04T18:41:51
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/7b531a1a6399a190c10642d470a45c406cb62374

Renamed entries:
        libpurple/protocols/jabber/JEPS to libpurple/protocols/jabber/XEPS
Modified files:
        COPYRIGHT ChangeLog autogen.sh finch/libgnt/gntentry.c
        finch/libgnt/gnttextview.c libpurple/Makefile.am
        libpurple/account.c libpurple/cipher.c libpurple/dnsquery.c
        libpurple/dnssrv.c libpurple/plugins/perl/Makefile.mingw
        libpurple/plugins/perl/common/Makefile.mingw
        libpurple/plugins/perl/perl-handlers.c
        libpurple/protocols/jabber/XEPS
        libpurple/protocols/jabber/caps.c
        libpurple/protocols/jabber/chat.c
        libpurple/protocols/jabber/chat.h
        libpurple/protocols/jabber/disco.c
        libpurple/protocols/jabber/google.c
        libpurple/protocols/jabber/jabber.c
        libpurple/protocols/jabber/jingle/jingle.c
        libpurple/protocols/jabber/roster.c
        libpurple/protocols/msn/contact.c
        libpurple/protocols/msn/msn.c libpurple/protocols/msn/msn.h
        libpurple/protocols/msn/nexus.c
        libpurple/protocols/msn/notification.c
        libpurple/protocols/msn/oim.c
        libpurple/protocols/msn/userlist.c
        libpurple/protocols/oscar/family_feedbag.c
        libpurple/protocols/oscar/family_icbm.c
        libpurple/protocols/oscar/family_oservice.c
        libpurple/protocols/oscar/flap_connection.c
        libpurple/protocols/oscar/oscar.c
        libpurple/protocols/oscar/oscar.h
        libpurple/protocols/silc/Makefile.mingw
        libpurple/protocols/silc10/Makefile.mingw
        libpurple/protocols/yahoo/libyahoo.c
        libpurple/protocols/yahoo/libymsg.c
        libpurple/protocols/yahoo/libymsg.h
        libpurple/protocols/yahoo/util.c
        libpurple/protocols/yahoo/yahoo_filexfer.c
        libpurple/protocols/yahoo/yahoo_filexfer.h
        libpurple/theme-loader.c libpurple/win32/global.mak
        pidgin/Makefile.mingw pidgin/gtkblist.c pidgin/gtkimhtml.c
        pidgin/gtkmain.c pidgin/gtkprefs.c pidgin/gtkrequest.c
        pidgin/gtkstatusbox.c
        pidgin/plugins/perl/common/Makefile.mingw
        pidgin/plugins/win32/winprefs/Makefile.mingw po/ca.po

ChangeLog: 

merge of '06b53ea832679e0dfb2e6d5d0c1b69e61f1bd38b'
     and 'ea2f92f486297b27994d3652e14f799eb0964834'