From: Michael Stapelberg <michael@stapelberg.de>
Date: Mon, 12 Sep 2016 20:23:10 +0000 (+0200)
Subject: Merge branch 'nmschulte-fix_numlock_shift' into next
X-Git-Tag: 4.13~42
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=4765a8fb844c777b11cbca6505aee99ff536b045;p=i3%2Fi3

Merge branch 'nmschulte-fix_numlock_shift' into next
---

4765a8fb844c777b11cbca6505aee99ff536b045