branches/1.1: Fixed a merge error

git-svn-id: https://svn.apache.org/repos/asf/jackrabbit/branches/1.1@480505 13f79535-47bb-0310-9956-ffa450edef68
1 file changed
tree: ec74a0a6560f526080d276e5cbeae4f07ce15057
  1. jackrabbit/
  2. jca/
  3. jcr-rmi/
  4. jcr-server/
  5. textfilters/
  6. RELEASE-NOTES.txt