tree bc8ebfcbba6c4491963f0366a9c3e23263307e49
parent 10cfda7be4859892d3df8734d6a448da2ea708c8
author Florian Müller <fmui@apache.org> 1332861814 +0000
committer Florian Müller <fmui@apache.org> 1332861814 +0000

- fixed an ACL merging bug
- moved back to older SHFB version

git-svn-id: https://svn.apache.org/repos/asf/chemistry/dotcmis/trunk@1305873 13f79535-47bb-0310-9956-ffa450edef68