tree 18017afe8eac7dc832cf989937cc21d8552a4eab
parent da69fba2059e022badda8941e92158f473f57100
author Simon Steiner <ssteiner@apache.org> 1432627098 +0000
committer Simon Steiner <ssteiner@apache.org> 1432627098 +0000

Merge from trunk

git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/branches/fop-2_0@1681707 13f79535-47bb-0310-9956-ffa450edef68