From: Thomas Citharel <tcit@tcit.fr>
Date: Thu, 19 Feb 2015 00:39:47 +0000 (+0100)
Subject: Merge branch 'dev' of github.com:wallabag/wallabag into dev
X-Git-Tag: 1.9.1alpha1~12
X-Git-Url: https://git.immae.eu/?a=commitdiff_plain;h=9e5dc91c0383973470f2292b1ec123c48e908e17;p=github%2Fwallabag%2Fwallabag.git

Merge branch 'dev' of github.com:wallabag/wallabag into dev
---

9e5dc91c0383973470f2292b1ec123c48e908e17