From: Juanjo Benages <juanjo@benages.eu>
Date: Tue, 1 Mar 2016 20:02:13 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/v2' into v2
X-Git-Tag: 2.0.0-beta.2~16^2~5
X-Git-Url: https://git.immae.eu/?a=commitdiff_plain;h=9c5cfd2823d2f7ed272245e3bab55c33d92dccfd;hp=-c;p=github%2Fwallabag%2Fwallabag.git

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

9c5cfd2823d2f7ed272245e3bab55c33d92dccfd