From: Stephen Christie <undersampled@live.com>
Date: Wed, 3 Aug 2016 02:51:30 +0000 (-0400)
Subject: Merge branch 'master' of http://github.com/jackhumbert/qmk_firmware
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=bf2b260429dbc015d49d005065a37441c8f15753;p=qmk_firmware.git

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

bf2b260429dbc015d49d005065a37441c8f15753