From: Xyverz <xyverz@gmail.com>
Date: Thu, 19 Jan 2017 14:54:18 +0000 (-0800)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=b8b2a55973b689fb4e827f6e967163114c575cd6;p=qmk_firmware.git

Merge remote-tracking branch 'upstream/master'
---

b8b2a55973b689fb4e827f6e967163114c575cd6