From: Marius Olbertz <marius.olbertz@gmail.com>
Date: Sat, 14 Jan 2017 09:32:01 +0000 (+0100)
Subject: Merge branch 'develop' into keyboard-mock
X-Git-Tag: v6.4.0-rc1~68^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F9654%2Fhead;p=thirdparty%2Ffoundation%2Ffoundation-sites.git

Merge branch 'develop' into keyboard-mock
---

996f7be1bec52e60db110f0099cea9954ed362d6