From: johannes <developer.johannes.larsson@gmail.com>
Date: Fri, 3 Feb 2017 09:49:46 +0000 (+0100)
Subject: Merge branch 'master' of https://github.com/Johannes-Larsson/qmk_firmware
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=453cd25ab8206ff51beedf39b8a0856e5bbcf04e;p=qmk_firmware.git

Merge branch 'master' of https://github.com/Johannes-Larsson/qmk_firmware
---

453cd25ab8206ff51beedf39b8a0856e5bbcf04e