From: Jack Humbert <jack.humb@gmail.com>
Date: Mon, 16 Mar 2015 16:01:35 +0000 (-0400)
Subject: Merge pull request #6 from tmk/master
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=9307a0a3e415d33d0858283f67fcba4c59a042ff;p=qmk_firmware.git

Merge pull request #6 from tmk/master

pulling from tmk
---

9307a0a3e415d33d0858283f67fcba4c59a042ff