From: Christopher Browne <cbbrowne@ca.afilias.info>
Date: Thu, 16 Jun 2016 20:43:27 +0000 (-0400)
Subject: Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=b2cc1ff0de0280176365aae470d08ace778a65bb;p=qmk_firmware.git

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

b2cc1ff0de0280176365aae470d08ace778a65bb