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

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

a732003bfd1a780be0728cdacda71c0b3d8b59b3