From: cbbrowne <cbbrowne@cbbrowne.tor.int-afilias.info>
Date: Fri, 25 Nov 2016 17:06:35 +0000 (-0500)
Subject: Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=e3c735e400e6e7e78cbc9dfb17626e6066d8cf80;p=qmk_firmware.git

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

e3c735e400e6e7e78cbc9dfb17626e6066d8cf80