tree b06e63695c02971db94ca59dadfa16c3518accaf
parent 00dd9d04fee0a203f16ba0fef275778a7da49bc0
author Michael E. Rodriguez <erodriguez@apache.org> 1179974140 +0000
committer Michael E. Rodriguez <erodriguez@apache.org> 1179974140 +0000

Merged revisions r540837:541139 from ApacheDS trunk to SASL branch.

git-svn-id: https://svn.apache.org/repos/asf/directory/apacheds/branches/apacheds-sasl-branch@541140 13f79535-47bb-0310-9956-ffa450edef68