From: Lucas Hecht <Lucas Hecht>
Date: Thu, 25 Feb 2016 20:40:16 +0000 (+0100)
Subject: Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware into jackhumbert... 
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=34a7012a33cb17687a837990426e1058f34acb6d;p=qmk_firmware.git

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

34a7012a33cb17687a837990426e1058f34acb6d