From: Paul Hänsch <paul@plutz.net>
Date: Wed, 20 Jun 2018 20:38:51 +0000 (+0200)
Subject: Merge branch 'master' into elok
X-Git-Url: http://git.plutz.net/?p=bootimage;a=commitdiff_plain;h=ca7ca8a95a50179defde2d53c9fad51f2b005971

Merge branch 'master' into elok
---

ca7ca8a95a50179defde2d53c9fad51f2b005971