From: Christopher Browne <cbbrowne@ca.afilias.info>
Date: Thu, 25 Feb 2016 18:03:44 +0000 (-0500)
Subject: Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=d3d1f15597246512aabbb21e78fd86017bf17e19;p=qmk_firmware.git

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

d3d1f15597246512aabbb21e78fd86017bf17e19