From: Ante Laurijssen <antelaurijssen@gmail.com>
Date: Thu, 18 May 2017 03:06:57 +0000 (-0400)
Subject: Merge https://github.com/qmk/qmk_firmware
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=c686793b596cd3e2977a4c76b976df31e18bdb5b;p=qmk_firmware.git

Merge https://github.com/qmk/qmk_firmware

Update from QMK main
---

c686793b596cd3e2977a4c76b976df31e18bdb5b