From: Brendan Johan Lee <deadcyclo@vanntett.net>
Date: Fri, 27 Jan 2017 14:24:08 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=d7aa4724fbfe51ad016a285797ae664eba5cc150;p=qmk_firmware.git

Merge remote-tracking branch 'upstream/master'
---

d7aa4724fbfe51ad016a285797ae664eba5cc150