From: David Olsson <david.olsson@softhouse.se>
Date: Sat, 11 Feb 2017 09:50:37 +0000 (+0100)
Subject: Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware
X-Git-Url: https://git.donarmstrong.com/?p=qmk_firmware.git;a=commitdiff_plain;h=052f81aacaa3b5afa93f9db3667f31f9365348ce

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

052f81aacaa3b5afa93f9db3667f31f9365348ce