From: cbbrowne <cbbrowne@cbbrowne.tor.int-afilias.info>
Date: Mon, 15 Aug 2016 16:59: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=3cb1dce62238084c523763a9fc04ed7112525819;p=qmk_firmware.git

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

3cb1dce62238084c523763a9fc04ed7112525819