From: Mazin Bokhari <mazin.bokhari@gmail.com>
Date: Sun, 17 Jul 2016 20:35:05 +0000 (-0500)
Subject: Merge branch 'master' of https://github.com/mazinbokhari/qmk_firmware
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=6cd2b48fedba872853c9e2c29feef7ef2ef560a1;p=qmk_firmware.git

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

6cd2b48fedba872853c9e2c29feef7ef2ef560a1