From: Joshua T <joshua@sonofone.net>
Date: Sat, 7 Jan 2017 20:01:21 +0000 (-0600)
Subject: Merged from upstream
X-Git-Url: https://git.donarmstrong.com/?p=qmk_firmware.git;a=commitdiff_plain;h=8f8d10475956a17953f6db4db3f3b50bd795c0d8

Merged from upstream
---

8f8d10475956a17953f6db4db3f3b50bd795c0d8