Merge branch 'master' of ssh://mbaudier@git.argeo.org:322/var/lib/git/git.argeo.org...
authormbaudier <mbaudier@argeo.org>
Wed, 31 Dec 2014 16:28:24 +0000 (17:28 +0100)
committermbaudier <mbaudier@argeo.org>
Wed, 31 Dec 2014 16:28:24 +0000 (17:28 +0100)

Trivial merge