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

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

f4fbfe6e544bb2beab05464a23ab848ae4c5578a