From: Toni <jeder@mail1a.de>
Date: Fri, 19 Aug 2016 07:49:56 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/master' into amj60
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=225c73ed30b97229bcb88182b5153c27082886f9;p=qmk_firmware.git

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

225c73ed30b97229bcb88182b5153c27082886f9