From: Juanjo Benages <juanjo@benages.eu>
Date: Sun, 17 Jan 2016 18:31:49 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/dev' into dev
X-Git-Tag: 1.9.2~1^2~3^2
X-Git-Url: https://git.immae.eu/?a=commitdiff_plain;h=9c0f0ec5c5b19152fd29519fb6df8d954ff5454a;p=github%2Fwallabag%2Fwallabag.git

Merge remote-tracking branch 'upstream/dev' into dev
---

9c0f0ec5c5b19152fd29519fb6df8d954ff5454a