From: Christopher Browne <cbbrowne@ca.afilias.info>
Date: Wed, 13 Apr 2016 16:02:51 +0000 (-0400)
Subject: Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=6ec6b613536b7138ee0c87002b10da8fe0c0117d;p=qmk_firmware.git

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

6ec6b613536b7138ee0c87002b10da8fe0c0117d