From: dbroqua <dbroqua@mousur.org>
Date: Tue, 23 Aug 2016 11:39:49 +0000 (+0200)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Url: https://git.donarmstrong.com/?p=qmk_firmware.git;a=commitdiff_plain;h=e65252d591b88f3c108d40ea5eeda9d561bc237c

Merge remote-tracking branch 'upstream/master'

# Conflicts:
#	keyboards/planck/keymaps/dbroqua/keymap.c
---

e65252d591b88f3c108d40ea5eeda9d561bc237c