]> git.donarmstrong.com Git - kiibohd-controller.git/commitdiff
Merge branch 'smasher816-master'
authorJacob Alexander <haata@kiibohd.com>
Sun, 15 Feb 2015 08:44:09 +0000 (00:44 -0800)
committerJacob Alexander <haata@kiibohd.com>
Sun, 15 Feb 2015 08:44:09 +0000 (00:44 -0800)

Trivial merge