From: cbbrowne <cbbrowne@cbbrowne.tor.int-afilias.info>
Date: Wed, 23 Nov 2016 22:47:16 +0000 (-0500)
Subject: Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=c05cbaf534d7d58bb8ca4cd9405525b941194372;p=qmk_firmware.git

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

c05cbaf534d7d58bb8ca4cd9405525b941194372