From: Christopher Browne <cbbrowne@ca.afilias.info>
Date: Wed, 22 Jun 2016 20:42:58 +0000 (-0400)
Subject: Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=7eee1526bdf035ddb8abc3c7d189f0e84c50cc31;p=qmk_firmware.git

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

7eee1526bdf035ddb8abc3c7d189f0e84c50cc31