]> git.donarmstrong.com Git - qmk_firmware.git/commitdiff
Merge branch 'master' into promethium
authorPriyadi Iman Nurcahyo <priyadi@priyadi.net>
Sat, 26 Nov 2016 06:31:17 +0000 (13:31 +0700)
committerPriyadi Iman Nurcahyo <priyadi@priyadi.net>
Sat, 26 Nov 2016 06:31:17 +0000 (13:31 +0700)

Trivial merge