]> source.dussan.org Git - archiva.git/commitdiff
Merged /archiva/trunk:r882055-882383
authorBrett Porter <brett@apache.org>
Fri, 20 Nov 2009 03:15:07 +0000 (03:15 +0000)
committerBrett Porter <brett@apache.org>
Fri, 20 Nov 2009 03:15:07 +0000 (03:15 +0000)
git-svn-id: https://svn.apache.org/repos/asf/archiva/branches/MRM-1025@882394 13f79535-47bb-0310-9956-ffa450edef68


Trivial merge