From: Jack Humbert <jack.humb@gmail.com>
Date: Mon, 29 May 2017 15:37:33 +0000 (-0400)
Subject: Merge branch 'master' of https://github.com/qmk/qmk_firmware
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=988941cc0a0e8a4bfa0b696aba9a57c0a105eb64;p=qmk_firmware.git

Merge branch 'master' of https://github.com/qmk/qmk_firmware
---

988941cc0a0e8a4bfa0b696aba9a57c0a105eb64