From: coderkun <olli@coderkun.de>
Date: Fri, 15 Jan 2016 19:21:23 +0000 (+0100)
Subject: merge upstream
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=47fce7e0a953523cb538d4aecf0592802539ba5f;p=qmk_firmware.git

merge upstream
---

47fce7e0a953523cb538d4aecf0592802539ba5f