From: Nicolas Lœuillet <nicolas.loeuillet@smile.fr>
Date: Fri, 10 Oct 2014 11:33:54 +0000 (+0200)
Subject: Merge branch 'dev'
X-Git-Tag: 1.8.0
X-Git-Url: https://git.immae.eu/?p=github%2Fwallabag%2Fwallabag.git;a=commitdiff_plain;h=44d35257e805856b4913c63fcbed3c0acb64bae8

Merge branch 'dev'
---

44d35257e805856b4913c63fcbed3c0acb64bae8