From: Michael Stapelberg <michael@stapelberg.de>
Date: Tue, 2 Aug 2011 08:47:12 +0000 (+0200)
Subject: Merge branch 'multi-keycodes-fix' into next
X-Git-Tag: 4.0.2~65^2~5
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=610620ec45a7db4ecb7b9c7fdfabcdda3cbe4ac2;p=i3%2Fi3

Merge branch 'multi-keycodes-fix' into next
---

610620ec45a7db4ecb7b9c7fdfabcdda3cbe4ac2