tree bcb94e63969439e54a6ed55d890d8230414beab4
parent 5cd94f6b22dcc87707d0251a1498ca4f066fae3b
author Marshall Schor <schor@apache.org> 1273843404 +0000
committer Marshall Schor <schor@apache.org> 1273843404 +0000

[UIMA-1756] merge trunk -> branch

git-svn-id: https://svn.apache.org/repos/asf/uima/uimaj/branches/mavenAlign@944248 13f79535-47bb-0310-9956-ffa450edef68