tree 528c0421cb7597e1eef88dd69e66fe5341b59582
parent 93353312a8e6ca6f8a2fc521fb6ca66862d5b36d
author Marshall Schor <schor@apache.org> 1278592277 +0000
committer Marshall Schor <schor@apache.org> 1278592277 +0000

[UIMA-1832] merge trunk -> branch (no changes except for recording merge info)

git-svn-id: https://svn.apache.org/repos/asf/uima/build/branches/depend-on-parent-pom-4@961735 13f79535-47bb-0310-9956-ffa450edef68