From: Bernhard Kubicek <kubicek@gmx.at>
Date: Tue, 15 Nov 2011 21:53:04 +0000 (+0100)
Subject: Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into Marlin_v1
X-Git-Tag: iwj-success-2012-07-29~231
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=46f80e82d947dcb928abdfe96ee1e2f48ea82de5;p=marlin.git

Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into Marlin_v1

Conflicts:
	Marlin/ultralcd.h
---

46f80e82d947dcb928abdfe96ee1e2f48ea82de5