From: David Olsson <david.olsson@softhouse.se>
Date: Wed, 18 Jan 2017 21:58:49 +0000 (+0100)
Subject: Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=f35adb4f37965489b846468567f9dc65c5eec05a;p=qmk_firmware.git

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

f35adb4f37965489b846468567f9dc65c5eec05a