From: Nicolas Lœuillet <nicolas@loeuillet.org>
Date: Tue, 22 Jul 2014 19:45:21 +0000 (+0200)
Subject: Merge branch 'anno1337-dev' into dev
X-Git-Tag: 1.8.0^2~26
X-Git-Url: https://git.immae.eu/?a=commitdiff_plain;h=ebd6bf6007e0fad4c3e11dac0e79f687e1d195a2;p=github%2Fwallabag%2Fwallabag.git

Merge branch 'anno1337-dev' into dev
---

ebd6bf6007e0fad4c3e11dac0e79f687e1d195a2