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

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

cdad01b57a5a9f9439b8b955dc1b847133c6eca8