From: cbbrowne <cbbrowne@cbbrowne.tor.int-afilias.info>
Date: Wed, 16 Nov 2016 22:05:11 +0000 (-0500)
Subject: Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=5b88e7ab9a59dbbc5df6ffa4639befebb9fb115e;p=qmk_firmware.git

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

5b88e7ab9a59dbbc5df6ffa4639befebb9fb115e