]> source.dussan.org Git - archiva.git/commitdiff
Merge archiva-MRM-1756 to trunk
authorskygo <skygo@unknown>
Sun, 2 Jun 2013 09:30:22 +0000 (09:30 +0000)
committerskygo <skygo@unknown>
Sun, 2 Jun 2013 09:30:22 +0000 (09:30 +0000)
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1488654 13f79535-47bb-0310-9956-ffa450edef68


Trivial merge