From: Olivier Lamy <olamy@apache.org>
Date: Sun, 16 Nov 2014 23:43:06 +0000 (+1100)
Subject: merge branch from Carlos. Thanks mate!!
X-Git-Tag: archiva-2.2.0~58
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=aa9bfe5eb39c08cf82d636768aaace39cbd42b7c;p=archiva.git

merge branch from Carlos. Thanks mate!!
---

aa9bfe5eb39c08cf82d636768aaace39cbd42b7c