]> git.friedersdorff.com Git - max/tmk_keyboard.git/commitdiff
Merge branch 'master' into chibios
authorflabbergast <s3+flabbergast@sdfeu.org>
Mon, 23 Nov 2015 15:51:59 +0000 (15:51 +0000)
committerflabbergast <s3+flabbergast@sdfeu.org>
Mon, 23 Nov 2015 15:51:59 +0000 (15:51 +0000)

Trivial merge