From: Balz Guenat <balz.guenat@gmail.com>
Date: Sat, 12 Aug 2017 10:14:33 +0000 (+0200)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=430151dd51b8b0d925850ad4d52c8bae41d3c154;p=qmk_firmware.git

Merge remote-tracking branch 'upstream/master'

# Conflicts:
#	docs/faq_keymap.md
---

430151dd51b8b0d925850ad4d52c8bae41d3c154