From: cbbrowne <cbbrowne@cbbrowne.tor.int-afilias.info>
Date: Mon, 17 Oct 2016 14:53:39 +0000 (-0400)
Subject: Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=0469bd8ffaffc5ecbcd972745d997af5a083ee72;p=qmk_firmware.git

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

0469bd8ffaffc5ecbcd972745d997af5a083ee72