pidgin: 71329f62: merge of '50ee8ea93d28a742019b72de39c814...

[evands at pidgin.im]

-----------------------------------------------------------------
Revision: 71329f62bbfea27b695e6d17ce5b22281a9b70ca
Ancestor: 50ee8ea93d28a742019b72de39c81427af3ca785
Ancestor: e7d6a0a271d8fe8435f200e0f1ec123053e57493
Author: evands at pidgin.im
Date: 2008-05-27T01:38:35
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/71329f62bbfea27b695e6d17ce5b22281a9b70ca

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

ChangeLog: 

merge of '50ee8ea93d28a742019b72de39c81427af3ca785'
     and 'e7d6a0a271d8fe8435f200e0f1ec123053e57493'