From: Nicolas Coden <nicolas@ncoden.fr>
Date: Thu, 15 Mar 2018 20:54:24 +0000 (+0100)
Subject: Merge branch 'master' into ocularrhythm/patch-8
X-Git-Tag: v6.6.0~22^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F11060%2Fhead;p=thirdparty%2Ffoundation%2Ffoundation-sites.git

Merge branch 'master' into ocularrhythm/patch-8
---

0b4d932f37c7c46368db4b4ecb2027b69b0c0264