pidgin: 8b9a4a15: merge of 'a74fb0eb2e8074bf51ffad1750e6ee...

[darkrain42 at pidgin.im]

-----------------------------------------------------------------
Revision: 8b9a4a1563ad7750073f91125f00134e5fa82b6c
Ancestor: a74fb0eb2e8074bf51ffad1750e6eeaf2b28c645
Ancestor: ccf98af3ddcc098e9248e09d20f3d0801f3ff47d
Author: darkrain42 at pidgin.im
Date: 2009-12-11T03:07:52
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/8b9a4a1563ad7750073f91125f00134e5fa82b6c

Modified files:
        libpurple/protocols/jabber/jingle/jingle.c po/de.po

ChangeLog: 

merge of 'a74fb0eb2e8074bf51ffad1750e6eeaf2b28c645'
     and 'ccf98af3ddcc098e9248e09d20f3d0801f3ff47d'