tree 1c0b9001d57499b3ae28e49dd43bfff69b37877e
parent 48f1e243a67d2a9413b2ebe6b8ef4f64fe23c1df
author Olivier Lamy <olamy@apache.org> 1392465636 +0000
committer Olivier Lamy <olamy@apache.org> 1392465636 +0000

Merge branch 'trunk' into 2.0.0-RC

git-svn-id: https://svn.apache.org/repos/asf/archiva/branches/2.0.0-RC@1568624 13f79535-47bb-0310-9956-ffa450edef68