From: Damien <Dbroqua@users.noreply.github.com>
Date: Sat, 29 Apr 2017 13:03:52 +0000 (+0200)
Subject: Merge pull request #21 from qmk/master
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=584b804ee33d53102fef3b8cdd045bca4c47bf26;p=qmk_firmware.git

Merge pull request #21 from qmk/master

Merge from QMK
---

584b804ee33d53102fef3b8cdd045bca4c47bf26