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

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

ee3c7892ad585e2e702d8975420d25ae052d97bb