From: cbbrowne <cbbrowne@cbbrowne.tor.int-afilias.info>
Date: Tue, 29 Nov 2016 17:20:26 +0000 (-0500)
Subject: Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=ff1b563e851858a291ac226bc7e31055c7da6618;p=qmk_firmware.git

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

ff1b563e851858a291ac226bc7e31055c7da6618