From: Christopher Browne <cbbrowne@ca.afilias.info>
Date: Mon, 8 Feb 2016 15:53:50 +0000 (-0500)
Subject: Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=bbcc1046a6c7417367c602b7ff46df1cef93804f;p=qmk_firmware.git

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

bbcc1046a6c7417367c602b7ff46df1cef93804f