From: Christopher Browne <cbbrowne@ca.afilias.info>
Date: Mon, 4 Jul 2016 16:32:08 +0000 (-0400)
Subject: Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=2e1cfaf73fccdfaba2d7542f00bd7c3d49998d5d;hp=-c;p=qmk_firmware.git

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

2e1cfaf73fccdfaba2d7542f00bd7c3d49998d5d