From: flabbergast <s3+flabbergast@sdfeu.org>
Date: Fri, 18 Dec 2015 20:54:41 +0000 (+0000)
Subject: Merge remote-tracking branch 'upstream/master' into chibios
X-Git-Url: https://git.friedersdorff.com/?a=commitdiff_plain;h=8952d617ea489eed11b454abffc96cb286b1acbc;p=max%2Ftmk_keyboard.git

Merge remote-tracking branch 'upstream/master' into chibios
---

8952d617ea489eed11b454abffc96cb286b1acbc