From: Martin Stockhammer <martin.stockhammer@ars.de>
Date: Fri, 10 Nov 2017 23:10:29 +0000 (+0100)
Subject: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/archiva
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=8462e8785037b5b4a9ed2821e604343df39372c7;p=archiva.git

Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/archiva
---

8462e8785037b5b4a9ed2821e604343df39372c7