pidgin: 529ef946: merge of '71329f62bbfea27b695e6d17ce5b22...

[evands at pidgin.im]

-----------------------------------------------------------------
Revision: 529ef9464a2679b6c81a94a97270633881245612
Ancestor: 71329f62bbfea27b695e6d17ce5b22281a9b70ca
Ancestor: 99656e64231e6958a0539cd0367164f3c1b83549
Author: evands at pidgin.im
Date: 2008-05-27T01:38:38
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/529ef9464a2679b6c81a94a97270633881245612

Modified files:
        COPYRIGHT configure.ac libpurple/buddyicon.h
        libpurple/dnsquery.c libpurple/dnssrv.c libpurple/internal.h
        libpurple/nat-pmp.c libpurple/network.c libpurple/notify.c
        libpurple/notify.h libpurple/protocols/jabber/buddy.c
        libpurple/protocols/zephyr/Makefile.am
        libpurple/protocols/zephyr/zephyr.c libpurple/proxy.c
        libpurple/prpl.h pidgin/gtkmain.c po/de.po

ChangeLog: 

merge of '71329f62bbfea27b695e6d17ce5b22281a9b70ca'
     and '99656e64231e6958a0539cd0367164f3c1b83549'