From: Maria Odea B. Ching <oching@apache.org>
Date: Mon, 5 Jul 2010 02:33:18 +0000 (+0000)
Subject: merge -c 960322 from trunk (MRM-1394)
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=27ad7cd1086af31d9db925c06e4af51a28add1cd;p=archiva.git

merge -c 960322 from trunk (MRM-1394)


git-svn-id: https://svn.apache.org/repos/asf/archiva/branches/archiva-MRM-980@960421 13f79535-47bb-0310-9956-ffa450edef68
---

27ad7cd1086af31d9db925c06e4af51a28add1cd