From: Damien <Dbroqua@users.noreply.github.com>
Date: Fri, 26 May 2017 13:57:08 +0000 (+0200)
Subject: Merge pull request #22 from qmk/master
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=0a4a966c6648e66a1129ae3af36639054d3e0ed3;p=qmk_firmware.git

Merge pull request #22 from qmk/master

Merge from QMK
---

0a4a966c6648e66a1129ae3af36639054d3e0ed3