From: Christopher Browne <cbbrowne@ca.afilias.info>
Date: Wed, 15 Jun 2016 22:38:30 +0000 (-0400)
Subject: Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=10fe3f001beee4cec9ce66cde657c356bca6125d;p=qmk_firmware.git

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

10fe3f001beee4cec9ce66cde657c356bca6125d