tree a8e22afb22557ecff6fba8223364f742d9aded8b
parent 37e654aaa29255ae72f0a2a85441d73b3984f14d
author Emmanuel Lecharny <elecharny@apache.org> 1288450157 +0000
committer Emmanuel Lecharny <elecharny@apache.org> 1288450157 +0000

injected the merge information

git-svn-id: https://svn.apache.org/repos/asf/directory/apacheds/trunk-with-dependencies@1029088 13f79535-47bb-0310-9956-ffa450edef68