From: Christopher Browne <cbbrowne@ca.afilias.info>
Date: Thu, 23 Jun 2016 15:34:50 +0000 (-0400)
Subject: Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=a4bdb0ac0e6d44c9c9a2d8910a5ca5b7fb49fcbf;p=qmk_firmware.git

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

a4bdb0ac0e6d44c9c9a2d8910a5ca5b7fb49fcbf