From: Jack Humbert <jack.humb@gmail.com>
Date: Sun, 17 Apr 2016 22:15:35 +0000 (-0400)
Subject: merging
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=e0ab1dcf4c6e97b81e4ea4c2521163e6917ef838;p=qmk_firmware.git

merging
---

e0ab1dcf4c6e97b81e4ea4c2521163e6917ef838