From: Didier Loiseau <didierloiseau+git@gmail.com>
Date: Sat, 23 Jan 2016 15:44:59 +0000 (+0100)
Subject: Merge remote-tracking branch 'jackhumbert/master' into typematrix
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=ad2a4c32039e6ac2f64aacb42dd274cc0ac46f97;p=qmk_firmware.git

Merge remote-tracking branch 'jackhumbert/master' into typematrix
---

ad2a4c32039e6ac2f64aacb42dd274cc0ac46f97