From: Xyverz <xyverz@gmail.com>
Date: Thu, 18 Aug 2016 06:53:56 +0000 (-0700)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=385b827c858d492e8ebafd85bac32ab738292d41;p=qmk_firmware.git

Merge remote-tracking branch 'upstream/master'

this merge is necessary,
---

385b827c858d492e8ebafd85bac32ab738292d41