im.pidgin.pidgin: 992f49d89c76aeab454dd5a822cd62b9a1848557

Fri Dec 21 04:35:43 EST 2007

-----------------------------------------------------------------
Revision: 992f49d89c76aeab454dd5a822cd62b9a1848557
Ancestor: 72df99671f84834d934f83b25ce492f289d77063
Ancestor: c00604416a0d01f2fbf75b5cc6b6d4f9371e7a67
Author: sadrul at pidgin.im
Date: 2007-12-21T09:33:45
Branch: im.pidgin.pidgin

Modified files:
        AUTHORS doc/pidgin.1.in libpurple/cipher.c
        libpurple/cipher.h libpurple/protocols/jabber/auth.c
        libpurple/tests/test_cipher.c pidgin/gtkaccount.c
        pidgin/gtkconv.c pidgin/gtkdialogs.c pidgin/pidgintooltip.c
        po/de.po

ChangeLog: 

merge of '72df99671f84834d934f83b25ce492f289d77063'
     and 'c00604416a0d01f2fbf75b5cc6b6d4f9371e7a67'