Merge branch 'translations' into 2.7
authorghost <andreas.monzner@multimedia-labs.de>
Tue, 5 Jan 2010 13:31:44 +0000 (14:31 +0100)
committerghost <andreas.monzner@multimedia-labs.de>
Tue, 5 Jan 2010 13:31:44 +0000 (14:31 +0100)
commit5dda545b5e85bb7f8b5bfc25cc6a7d96e2f830cd
tree97683025abadccaa8ffddfa121e9f83675b8211c
parentaa64f107516da5aaff79d6d096f8014f65ea3283
parent890dd6626c3b26f832d8089a3a81289df7005e97
Merge branch 'translations' into 2.7