From: Toni <jeder@mail1a.de>
Date: Wed, 27 Jul 2016 18:35:13 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/master' into iso_split_rshift
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=9f21c0aa0618531cebc94a2af14d151b9357859f;p=qmk_firmware.git

Merge remote-tracking branch 'origin/master' into iso_split_rshift
merge with master
---

9f21c0aa0618531cebc94a2af14d151b9357859f