From: Jason Janse van Rensburg <l33tjas.0n@gmail.com>
Date: Tue, 30 Aug 2016 12:54:00 +0000 (+0200)
Subject: Merge branch 'master'
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=fc2ca62a3b9552175eb7c27cc11f3a5af6cfae50;p=qmk_firmware.git

Merge branch 'master'

Conflicts:
	keyboards/planck/keymaps/bone2planck/keymap.c
---

fc2ca62a3b9552175eb7c27cc11f3a5af6cfae50