From: cbbrowne <cbbrowne@cbbrowne.tor.int-afilias.info>
Date: Fri, 11 Nov 2016 15:39:07 +0000 (-0500)
Subject: Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=992ec01b5d3e280ad7c5b87afde941ab37f430b5;p=qmk_firmware.git

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

992ec01b5d3e280ad7c5b87afde941ab37f430b5