From: cbbrowne <cbbrowne@cbbrowne.tor.int-afilias.info>
Date: Mon, 28 Nov 2016 17:27:42 +0000 (-0500)
Subject: Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=5776f39667c82e1053b46fd12d8c6faa5b5acf81;p=qmk_firmware.git

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

5776f39667c82e1053b46fd12d8c6faa5b5acf81