From: Alex Johnstone <alexjj@gmail.com>
Date: Tue, 5 Apr 2016 14:44:37 +0000 (-0700)
Subject: Merge pull request #5 from jackhumbert/master
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=1facc53a26294df7fb2a42f8f3d025176b8c384a;p=qmk_firmware.git

Merge pull request #5 from jackhumbert/master

Sync with upstream
---

1facc53a26294df7fb2a42f8f3d025176b8c384a