tree 01c559a88855a43437aca795e29f081434440c38
parent 7d44b9cf46d8c1ca8a53d3b382be1e716cb67861
author Marshall Schor <schor@apache.org> 1278596744 +0000
committer Marshall Schor <schor@apache.org> 1278596744 +0000

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

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