From: Christopher Browne <cbbrowne@ca.afilias.info>
Date: Thu, 7 Jul 2016 15:13:22 +0000 (-0400)
Subject: Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=97dfbd1afce005392aa8f067e89bdf95334bdea5;p=qmk_firmware.git

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

97dfbd1afce005392aa8f067e89bdf95334bdea5