From: Nicolas Lœuillet <nicolas.loeuillet@gmail.com>
Date: Mon, 3 Feb 2014 10:56:01 +0000 (+0100)
Subject: Merge branch 'dev' of git://github.com/mariroz/wallabag into mariroz-dev
X-Git-Tag: 1.4.0^2~4
X-Git-Url: https://git.immae.eu/?a=commitdiff_plain;h=f85bfdf186c525056e7c30e6b072b1bea9ba80c9;p=github%2Fwallabag%2Fwallabag.git

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

f85bfdf186c525056e7c30e6b072b1bea9ba80c9