From: Christopher Browne <cbbrowne@ca.afilias.info>
Date: Wed, 3 Feb 2016 18:42:42 +0000 (-0500)
Subject: Merge branch 'master' of github.com:cbbrowne/qmk_firmware
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=259e5e28e66b6319a63afb36b81aa74226f5c346;p=qmk_firmware.git

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

259e5e28e66b6319a63afb36b81aa74226f5c346