]> git.donarmstrong.com Git - qmk_firmware.git/commitdiff
Merge branch 'master' into promethium
authorPriyadi Iman Nurcahyo <priyadi@priyadi.net>
Sat, 11 Feb 2017 17:09:25 +0000 (00:09 +0700)
committerPriyadi Iman Nurcahyo <priyadi@priyadi.net>
Sat, 11 Feb 2017 17:09:25 +0000 (00:09 +0700)

Trivial merge