From: luc wastiaux <luc.wastiaux@airpost.net>
Date: Sun, 12 Feb 2017 23:44:28 +0000 (+0800)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=352d79e1fbbd7eea65793abb261dd544fec7bb1c;p=qmk_firmware.git

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

352d79e1fbbd7eea65793abb261dd544fec7bb1c