From: François Boulogne <fboulogne sciunto org>
Date: Mon, 18 Jan 2016 01:54:34 +0000 (-0500)
Subject: Merge branch 'master' of https://gitlab.com/mojo42/Jirafeau
X-Git-Tag: 1.2.0~37^2^2~3
X-Git-Url: https://git.p6c8.net/jirafeau.git/commitdiff_plain/2c7751d5735941e55187be8e34ea987912fcc3f3?ds=sidebyside;hp=--cc

Merge branch 'master' of https://gitlab.com/mojo42/Jirafeau
---

2c7751d5735941e55187be8e34ea987912fcc3f3