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

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

83b67b0cf30ad158ac2d2f74f223002c8b2eeafa