From: Stick <nstickney@gmail.com>
Date: Thu, 6 Apr 2017 18:52:53 +0000 (-0500)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=7e38541124ed727263caa0c3187ee582bd778a27;p=qmk_firmware.git

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

7e38541124ed727263caa0c3187ee582bd778a27