From: Jack Humbert <jack.humb@gmail.com>
Date: Wed, 1 Nov 2017 16:22:31 +0000 (-0400)
Subject: Merge branch 'master' of https://github.com/qmk/qmk_firmware
X-Git-Url: https://git.donarmstrong.com/?p=qmk_firmware.git;a=commitdiff_plain;h=ddf49e8b21ad76d5b33a4bdbaa5b067c587e57c8

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

ddf49e8b21ad76d5b33a4bdbaa5b067c587e57c8