Merge branch 'translations'
authorghost <andreas.monzner@multimedia-labs.de>
Wed, 18 Nov 2009 18:07:32 +0000 (19:07 +0100)
committerghost <andreas.monzner@multimedia-labs.de>
Wed, 18 Nov 2009 18:07:32 +0000 (19:07 +0100)
commit7c85ede71f2779a544fb9094d5ea2a170ee4a76b
tree313960e87a5b3e3cdcc26b7a18dc11d38a3b087e
parent31ff36240efbac1aadd44ade1fed81dd41088526
parent4df48c8f3ac15533721f2f58c2675ed7eda4e5bb
Merge branch 'translations'