Merge branch 'translations'
authorMiriam Ruiz <miriam@debian.org>
Sun, 30 Nov 2008 19:16:28 +0000 (20:16 +0100)
committerMiriam Ruiz <miriam@debian.org>
Sun, 30 Nov 2008 19:16:28 +0000 (20:16 +0100)
commit1df6902a4ef9d2689ed56cb3de0a3c8f39ea4ed9
tree00f16a49747ac2cbe7d00a382873f95616e0b45e
parent893c0f718c3a2be8d13818eb52261b9791b938e0
parent3dfa77ccebd65d13b79e375c50f932f3bc7ba1bb
Merge branch 'translations'