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

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

c21a882ec9d4d41419ffb0a191c6e6538d0cfd63