From: Jerome Jutteau <mojo@couak.net>
Date: Fri, 26 Jun 2015 06:53:26 +0000 (+0200)
Subject: Merge branch 'master' of gitlab.com:mojo42/Jirafeau
X-Git-Tag: 1.1~54^2~1
X-Git-Url: https://git.p6c8.net/jirafeau.git/commitdiff_plain/8d8b06eb81e577c1b13ad3979251127ee25e0429?ds=sidebyside;hp=-c

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

8d8b06eb81e577c1b13ad3979251127ee25e0429