From: Christopher Browne <cbbrowne@ca.afilias.info>
Date: Thu, 26 May 2016 19:17:00 +0000 (-0400)
Subject: Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=d649ab34334ff568448c47a04fcf40f1aa960135;p=qmk_firmware.git

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

d649ab34334ff568448c47a04fcf40f1aa960135