From: cbbrowne <cbbrowne@cbbrowne.tor.int-afilias.info>
Date: Thu, 13 Oct 2016 17:05:33 +0000 (-0400)
Subject: Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=f74c560be853a5d6c563c73096c0d12fbfb31b6a;p=qmk_firmware.git

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

f74c560be853a5d6c563c73096c0d12fbfb31b6a