From: Jack Humbert <jack.humb@gmail.com>
Date: Sat, 16 Jan 2016 06:09:21 +0000 (-0500)
Subject: Merge branch 'smarkefile' of https://github.com/jackhumbert/tmk_keyboard into smarkefile
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=2dcdbb8f67b6aad27beb31cda0b21a4a34ce5903;p=qmk_firmware.git

Merge branch 'smarkefile' of https://github.com/jackhumbert/tmk_keyboard into smarkefile
---

2dcdbb8f67b6aad27beb31cda0b21a4a34ce5903