tree 6651ef31c11431c9cab0936fe728050c005bcfdc
parent 26c3ced7f18cd4f621132aba7f30248f91e78ddc
parent 34760e49d173153ea01a39e8b9b1f6d8a8db0500
author Armin Le Grand <alg@apache.org> 1395224082 +0000
committer Armin Le Grand <alg@apache.org> 1395224082 +0000

Resync/update with trunk as preparation to integration

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