From: Toni <jeder@mail1a.de>
Date: Mon, 15 Aug 2016 17:48:53 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/master' into iso_split_rshift
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=5ecebc3a66946ac7579bcd3afdacdb61387412d1;p=qmk_firmware.git

Merge remote-tracking branch 'origin/master' into iso_split_rshift
no idea what is merged
---

5ecebc3a66946ac7579bcd3afdacdb61387412d1