]> git.donarmstrong.com Git - qmk_firmware.git/commitdiff
Merge branch 'master' into coderkun_neo2
authorcoderkun <olli@coderkun.de>
Mon, 3 Oct 2016 14:35:40 +0000 (16:35 +0200)
committercoderkun <olli@coderkun.de>
Mon, 3 Oct 2016 14:35:40 +0000 (16:35 +0200)

Trivial merge