]> git.donarmstrong.com Git - qmk_firmware.git/commitdiff
Merge remote-tracking branch 'upstream/master'
authorlucwastiaux <luc.wastiaux@airpost.net>
Sat, 10 Dec 2016 04:49:47 +0000 (12:49 +0800)
committerlucwastiaux <luc.wastiaux@airpost.net>
Sat, 10 Dec 2016 04:49:47 +0000 (12:49 +0800)

Trivial merge