tree 611c92ce772bd67bd47748c20b0a6a81a476dcb9
parent 7682eb233aaf13e39f225f5b5adb041b70a70cb7
author Brett Porter <brett@apache.org> 1357555323 +0000
committer Brett Porter <brett@apache.org> 1357555323 +0000

merge from archiva-1.3.x


git-svn-id: https://svn.apache.org/repos/asf/archiva/tags/archiva-1.3.6@1429743 13f79535-47bb-0310-9956-ffa450edef68