From: cbbrowne <cbbrowne@cbbrowne.tor.int-afilias.info>
Date: Wed, 24 Aug 2016 21:47:09 +0000 (-0400)
Subject: Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=7c2a24b3154367bfff06163193e07303d9dcf86e;p=qmk_firmware.git

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

7c2a24b3154367bfff06163193e07303d9dcf86e