From: xyverz <xyverz@gmail.com>
Date: Thu, 17 Nov 2016 06:36:36 +0000 (-0800)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=b493f6a4ed14e74c268ae3d7a07577591fe71cc7;p=qmk_firmware.git

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

b493f6a4ed14e74c268ae3d7a07577591fe71cc7