From: Christopher Browne <cbbrowne@ca.afilias.info>
Date: Tue, 24 May 2016 16:34: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=48871b9b6b99201abc381ee27cfd94e211ca131a;p=qmk_firmware.git

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

48871b9b6b99201abc381ee27cfd94e211ca131a