tree 86ac148d859ffe728cafd55e1bd77ae2629d6455
parent e8d28b1afa750509f74a3ada83f374e2179670ac
parent 566c716734554a67cc8fcd0db60ce820889b551e
author Jan Iversen <jani@apache.org> 1385898024 +0000
committer Jan Iversen <jani@apache.org> 1385898024 +0000

merge from trunk


git-svn-id: https://svn.apache.org/repos/asf/openoffice/branches/l10n40@1546803 13f79535-47bb-0310-9956-ffa450edef68