From: Thomas Citharel <tcit@tcit.fr>
Date: Sun, 1 Feb 2015 11:23:30 +0000 (+0100)
Subject: Merge branch 'dev' into savewithtags
X-Git-Tag: 1.9beta~9^2~3
X-Git-Url: https://git.immae.eu/?a=commitdiff_plain;h=8f209e8a268e198bb449021c30fc783d69ee9818;p=github%2Fwallabag%2Fwallabag.git

Merge branch 'dev' into savewithtags
---

8f209e8a268e198bb449021c30fc783d69ee9818