From: Thomas Citharel <tcit@tcit.fr>
Date: Sat, 3 Jan 2015 10:38:32 +0000 (+0100)
Subject: Merge branch 'master' into dev
X-Git-Tag: 1.9beta~39
X-Git-Url: https://git.immae.eu/?p=github%2Fwallabag%2Fwallabag.git;a=commitdiff_plain;h=82978fbd578a13f9e0d19633a5f1162ab2814002

Merge branch 'master' into dev
To get the errors
---

82978fbd578a13f9e0d19633a5f1162ab2814002