From: cbbrowne <cbbrowne@cbbrowne.tor.int-afilias.info>
Date: Wed, 26 Oct 2016 14:55:41 +0000 (-0400)
Subject: Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=2a2920d92c5c314fe6291c92dee92fb6ff8294fe;p=qmk_firmware.git

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

2a2920d92c5c314fe6291c92dee92fb6ff8294fe