From: Christopher Browne <cbbrowne@hpaq.int.linuxdatabases.info>
Date: Sun, 31 Jan 2016 18:08:47 +0000 (-0500)
Subject: Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=db2d97d8dcadba22f1af6b32858ec1c47c3cb34c;p=qmk_firmware.git

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

db2d97d8dcadba22f1af6b32858ec1c47c3cb34c