From: TerryMathews <terry@terrymathews.net>
Date: Sat, 9 Jul 2016 20:46:00 +0000 (-0400)
Subject: Merge pull request #1 from jackhumbert/master
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=4decdd2b180f84c3d7a6e1fa87505591a7b729d6;p=qmk_firmware.git

Merge pull request #1 from jackhumbert/master

Catch up with jack's master
---

4decdd2b180f84c3d7a6e1fa87505591a7b729d6