From: Nicolas Lœuillet <nicolas@loeuillet.org>
Date: Thu, 24 Jul 2014 19:41:16 +0000 (+0200)
Subject: Merge branch 'fix/securityMaster'
X-Git-Tag: 1.7.2
X-Git-Url: https://git.immae.eu/?a=commitdiff_plain;h=af8292c1de1886cd975d79f0f42df40e0bd1c5bd;p=github%2Fwallabag%2Fwallabag.git

Merge branch 'fix/securityMaster'
---

af8292c1de1886cd975d79f0f42df40e0bd1c5bd