From: cbbrowne <cbbrowne@cbbrowne.tor.int-afilias.info>
Date: Mon, 19 Sep 2016 15:13:53 +0000 (-0400)
Subject: Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=2c3fcc6c08bf03aef17f7ed74394539187a9c734;p=qmk_firmware.git

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

2c3fcc6c08bf03aef17f7ed74394539187a9c734