]> git.donarmstrong.com Git - qmk_firmware.git/commitdiff
merge upstream
authorcoderkun <olli@coderkun.de>
Fri, 15 Jan 2016 19:21:23 +0000 (20:21 +0100)
committercoderkun <olli@coderkun.de>
Fri, 15 Jan 2016 19:21:23 +0000 (20:21 +0100)

Trivial merge