From: Peter Eichinger <peter.eichinger@gmail.com>
Date: Mon, 25 Jan 2016 16:46:50 +0000 (+0100)
Subject: Merge branch 'master' into flicker-fix
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=78192791bc0bb98d7a469f88a77febb3250c5b93;p=qmk_firmware.git

Merge branch 'master' into flicker-fix
---

78192791bc0bb98d7a469f88a77febb3250c5b93