Merge branch 'master' of https://mbaudier@code.argeo.org/git/apache2/argeo-slc.git
authorMathieu Baudier <mbaudier@argeo.org>
Wed, 24 Jan 2018 14:13:34 +0000 (15:13 +0100)
committerMathieu Baudier <mbaudier@argeo.org>
Wed, 24 Jan 2018 14:13:34 +0000 (15:13 +0100)

Trivial merge