From: René Werner <mail@renewerner.net>
Date: Thu, 25 Aug 2016 10:27:29 +0000 (+0200)
Subject: Merge remote-tracking branch 'upstream/master' into kitten_paw
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=22ef0bbac55215965c7fc6246d20d4591fbf14f4;p=qmk_firmware.git

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

22ef0bbac55215965c7fc6246d20d4591fbf14f4