From: cbbrowne <cbbrowne@cbbrowne.tor.int-afilias.info>
Date: Mon, 22 Aug 2016 17:16:49 +0000 (-0400)
Subject: Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=90abe70586a3d36bae4d2e3a1f1a02cc64d8925e;p=qmk_firmware.git

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

90abe70586a3d36bae4d2e3a1f1a02cc64d8925e