tree 12b3c83db49568bab0b98e31d6af1b83f25be24b
parent aeb03dd20606a1a122422a9030f527e9cadccd69
author Justin Edelson <justin@apache.org> 1500563655 +0000
committer Justin Edelson <justin@apache.org> 1500563655 +0000

Merge branch 'SLING-7015'

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