Merge remote-tracking branch 'waldi-salsa/godard-apache' into HEAD
authorMartin Zobel-Helas <zobel@debian.org>
Tue, 13 Feb 2018 21:50:36 +0000 (22:50 +0100)
committerMartin Zobel-Helas <zobel@debian.org>
Tue, 13 Feb 2018 21:50:36 +0000 (22:50 +0100)
commit641b06da386fa4d8f9d992fdcc88470c63bb8835
treed7846adbf2a83496c23cf62a2e0072d28f498971
parent9be737cd0d7bd14bcff3da0a4c465c7e8f8e4b9e
parent079351cce23bd0e9b2adf50e901f50e8d771c69c
Merge remote-tracking branch 'waldi-salsa/godard-apache' into HEAD

Signed-off-by: Martin Zobel-Helas <zobel@debian.org>