Mercurial > pidgin.yaz
diff ChangeLog @ 29424:4e93d6d57067
merge of '85129843be7a2667238f42c3652ffe0fd3fa37cb'
and '98b5bca32c1d0f95ef48796a9c257bfc7d886869'
Merge german translations. I arbitrarily picked a translation for the conflicting addition.
author | Paul Aurich <paul@darkrain42.org> |
---|---|
date | Thu, 11 Feb 2010 20:14:36 +0000 |
parents | a51d06bee84a |
children | 4e7fd81a39c6 a3e29e210b2e |