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

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

a4ff9f256738cf637553e7840d53f778d791fb6f