From: milestogo <milestogo@users.noreply.github.com>
Date: Wed, 8 Mar 2017 23:50:46 +0000 (-0800)
Subject: Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=ffb04bad660ba7c487e4b923e4391b6c7dd5eddd;p=qmk_firmware.git

Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware
---

ffb04bad660ba7c487e4b923e4391b6c7dd5eddd