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

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

f6d1ce7863893e6dd0233c57f04b262f6808d78a