Revision 0cccd126cc7ac2cab581e71c4c627c39a207484b

[rlaager at pidgin.im]

-----------------------------------------------------------------
Revision: 0cccd126cc7ac2cab581e71c4c627c39a207484b
Ancestor: 15f0eb2e525749743a7089f3d897fb1e8f4f91af
Ancestor: 2669d4a238528fc07bcf3987f371a956a9911253
Author: rlaager at pidgin.im
Date: 2007-05-05T22:45:34
Branch: im.pidgin.pidgin

Modified files:
        AUTHORS ChangeLog README doc/finch.1.in doc/pidgin.1.in
        finch/plugins/Makefile.am libpurple/internal.h
        libpurple/plugins/psychic.c
        libpurple/protocols/bonjour/bonjour.c
        libpurple/protocols/jabber/buddy.c
        libpurple/protocols/jabber/jabber.c
        libpurple/protocols/jabber/libxmpp.c
        libpurple/protocols/jabber/message.c libpurple/prpl.h
        pidgin/gtkdialogs.c pidgin/gtkdocklet.c pidgin/gtkmain.c
        pidgin/gtksound.c pidgin/plugins/raw.c pidgin.apspec.in
        pidgin.spec.in po/en_AU.po po/en_CA.po po/en_GB.po

ChangeLog: 

merge of '15f0eb2e525749743a7089f3d897fb1e8f4f91af'
     and '2669d4a238528fc07bcf3987f371a956a9911253'


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