]> git.donarmstrong.com Git - qmk_firmware.git/commitdiff
Merge remote-tracking branch 'upstream/master'
authorcoderkun <olli@coderkun.de>
Sat, 30 Jan 2016 11:08:27 +0000 (12:08 +0100)
committercoderkun <olli@coderkun.de>
Sat, 30 Jan 2016 11:08:27 +0000 (12:08 +0100)

Trivial merge