From: cbbrowne <cbbrowne@cbbrowne.tor.int-afilias.info>
Date: Wed, 10 Aug 2016 15:36:37 +0000 (-0400)
Subject: Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=83913f9197042839c9eaf262f4933262d7db6bbb;p=qmk_firmware.git

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

83913f9197042839c9eaf262f4933262d7db6bbb