From: Chris Browne <cbbrowne@hpaq.int.linuxdatabases.info>
Date: Sun, 6 Nov 2016 12:52:21 +0000 (-0500)
Subject: Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=4f1cb9fd5e76f22d1deeeb807e87969eacaa5714;p=qmk_firmware.git

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

4f1cb9fd5e76f22d1deeeb807e87969eacaa5714