From: Mark Sikora <marknsikora@gmail.com>
Date: Thu, 14 Apr 2016 15:26:21 +0000 (-0400)
Subject: Merge pull request #24 from marknsikora/master
X-Git-Url: https://git.friedersdorff.com/?a=commitdiff_plain;h=40e24e7ee9e8f871358a54953f9515c444ebf5b8;p=max%2Ftmk_keyboard.git

Merge pull request #24 from marknsikora/master

Merge upstream changes
---

40e24e7ee9e8f871358a54953f9515c444ebf5b8