From: Christopher Browne <cbbrowne@ca.afilias.info>
Date: Tue, 21 Jun 2016 16:30:17 +0000 (-0400)
Subject: Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=a6e109caa1e813d18f76f2b23dfd1655b6acf691;p=qmk_firmware.git

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

a6e109caa1e813d18f76f2b23dfd1655b6acf691