]> git.donarmstrong.com Git - qmk_firmware.git/commitdiff
Merged branch master into bone2planck
authorJason Janse van Rensburg <l33tjas.0n@gmail.com>
Mon, 25 Jul 2016 20:55:28 +0000 (22:55 +0200)
committerJason Janse van Rensburg <l33tjas.0n@gmail.com>
Mon, 25 Jul 2016 20:55:28 +0000 (22:55 +0200)

Trivial merge