]> git.donarmstrong.com Git - qmk_firmware.git/commitdiff
Merge branch 'master' into promethium
authorPriyadi Iman Nurcahyo <priyadi@priyadi.net>
Sun, 4 Dec 2016 19:01:20 +0000 (02:01 +0700)
committerPriyadi Iman Nurcahyo <priyadi@priyadi.net>
Sun, 4 Dec 2016 19:01:20 +0000 (02:01 +0700)

Trivial merge