From: Jack Humbert <jack.humb@gmail.com>
Date: Sat, 10 Jun 2017 16:26:57 +0000 (-0400)
Subject: Merge branch 'master' into improve_macro_docs
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=43b6179febfd25d6d9ce672c7303edff26f3c300;p=qmk_firmware.git

Merge branch 'master' into improve_macro_docs
---

43b6179febfd25d6d9ce672c7303edff26f3c300