From: Joshua Colbeck <Skrymir@users.noreply.github.com>
Date: Wed, 13 Jul 2016 04:14:30 +0000 (-0500)
Subject: Merge pull request #2 from jackhumbert/master
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=68ceffe53e299fb504bdd4733b1555a8558b472b;p=qmk_firmware.git

Merge pull request #2 from jackhumbert/master

Pull from upstream
---

68ceffe53e299fb504bdd4733b1555a8558b472b