pidgin: c78f9df1: merge of 'cd0389d15f155a498b41fe0f52b2b6...

[rlaager at pidgin.im]

-----------------------------------------------------------------
Revision: c78f9df1f3633eb2ba263bef8df4e9fae30d675a
Ancestor: cd0389d15f155a498b41fe0f52b2b611afab9d12
Ancestor: f28a758a8344c88a83bfc3be1f70311a644780b3
Author: rlaager at pidgin.im
Date: 2008-05-25T00:41:53
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/c78f9df1f3633eb2ba263bef8df4e9fae30d675a

Renamed entries:
        libpurple/protocols/zephyr/zephyr.h to libpurple/protocols/zephyr/zephyr_internal.h
Modified files:
        finch/gntnotify.c finch/libgnt/gntentry.c
        libpurple/protocols/zephyr/Makefile.am
        libpurple/protocols/zephyr/internal.h
        libpurple/protocols/zephyr/zephyr.c pidgin/gtkblist.c
        po/de.po

ChangeLog: 

merge of 'cd0389d15f155a498b41fe0f52b2b611afab9d12'
     and 'f28a758a8344c88a83bfc3be1f70311a644780b3'