From: Jerome Jutteau <mojo@couak.net>
Date: Tue, 7 Jul 2015 08:18:18 +0000 (+0200)
Subject: Merge branch 'master' of gitlab.com:mojo42/Jirafeau
X-Git-Tag: 1.1~49
X-Git-Url: https://git.p6c8.net/jirafeau_project.git/commitdiff_plain/0d42410243f361d3a55f26825c64b85cfe370655?ds=sidebyside

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

0d42410243f361d3a55f26825c64b85cfe370655