From: Jeremy Benoist <jeremy.benoist@gmail.com>
Date: Tue, 11 Oct 2016 19:01:30 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/master' into 2.2
X-Git-Tag: 2.2.0~3^2~90
X-Git-Url: https://git.immae.eu/?a=commitdiff_plain;h=e4cf672ccf61689ba28c2e89fc55f83167800b18;hp=e4cf672ccf61689ba28c2e89fc55f83167800b18;p=github%2Fwallabag%2Fwallabag.git

Merge remote-tracking branch 'origin/master' into 2.2
---