From: Martin Stockhammer <martin_s@apache.org>
Date: Sun, 14 May 2017 15:57:06 +0000 (+0200)
Subject: Merge branch 'master' into citest
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=acbd53dfe76a29920f6af405f18dc2dd0201b7fd;p=archiva.git

Merge branch 'master' into citest
---

acbd53dfe76a29920f6af405f18dc2dd0201b7fd