From: jpetermans <tibcmhhm@gmail.com>
Date: Mon, 8 May 2017 22:24:50 +0000 (-0700)
Subject: Merge remote-tracking branch 'upstream/master' into user_led_configuration
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=967cf0f6d43bd05c9951c7c31190971acd0799ea;p=qmk_firmware.git

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

967cf0f6d43bd05c9951c7c31190971acd0799ea