From: cr3473 <joe@createtank.com>
Date: Tue, 2 Jun 2015 21:04:05 +0000 (-0700)
Subject: Merge branch 'master' of github.com:jackhumbert/tmk_keyboard
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=f33d45f2004876469d8c1e989e99a149766cf4fc;p=qmk_firmware.git

Merge branch 'master' of github.com:jackhumbert/tmk_keyboard

Conflicts:
	keyboard/planck/PCB_GUIDE.md
---

f33d45f2004876469d8c1e989e99a149766cf4fc