From: cbbrowne <cbbrowne@cbbrowne.tor.int-afilias.info>
Date: Tue, 9 Aug 2016 16:10:48 +0000 (-0400)
Subject: Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=6a618fd44d076ae86d9c2a3414358ae9f3632ba8;p=qmk_firmware.git

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

6a618fd44d076ae86d9c2a3414358ae9f3632ba8