From: Damien <Dbroqua@users.noreply.github.com>
Date: Sat, 7 Jan 2017 14:45:19 +0000 (-0600)
Subject: Merge pull request #15 from jackhumbert/master
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=0fb82c15a5c9a69e17cff8dcd04c652d21381958;p=qmk_firmware.git

Merge pull request #15 from jackhumbert/master

Merge from qmk
---

0fb82c15a5c9a69e17cff8dcd04c652d21381958