From: cbbrowne <cbbrowne@cbbrowne.tor.int-afilias.info>
Date: Thu, 1 Dec 2016 17:54:16 +0000 (-0500)
Subject: Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=13eb2f826bc3ef9b6e7b4a1804d9ce50104cc833;p=qmk_firmware.git

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

13eb2f826bc3ef9b6e7b4a1804d9ce50104cc833