Merge branch 'master' of https://git.tine20.org/git/tine20
authorLars Kneschke <l.kneschke@metaways.de>
Wed, 13 Apr 2011 17:15:03 +0000 (19:15 +0200)
committerLars Kneschke <l.kneschke@metaways.de>
Wed, 13 Apr 2011 17:15:03 +0000 (19:15 +0200)
commit0c9a9b343e02d83120003bb13296c5957961b6f6
treefed32940a758842baaf98aa9089eb789d733b456
parenta0c7b0a4940f4777a995b6c6f1cbfe3f06a4a430
parent4b8b6434927451da6e6ba2fefe52b0a41e439f48
Merge branch 'master' of https://git.tine20.org/git/tine20
tine20/Tinebase/Translation.php