]> git.friedersdorff.com Git - max/tmk_keyboard.git/commitdiff
Merge pull request #24 from marknsikora/master
authorMark Sikora <marknsikora@gmail.com>
Thu, 14 Apr 2016 15:26:21 +0000 (11:26 -0400)
committerMark Sikora <marknsikora@gmail.com>
Thu, 14 Apr 2016 15:26:21 +0000 (11:26 -0400)
Merge upstream changes


Trivial merge