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

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

6ce0195e24bde8ce83976ba7fd2a701e7a1f13d7