From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Thu, 9 Aug 2012 19:28:46 +0000 (+0100)
Subject: Merge branch 'for-upstream-ff' into iwj
X-Git-Tag: firmware-tested-2012-08-10~4
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=800501b50f88d012ec9786d75dff98dfb43f4a7b;p=marlin.git

Merge branch 'for-upstream-ff' into iwj

Conflicts:
	Marlin/EEPROMwrite.h
	Marlin/Marlin.h
	Marlin/Marlin.pde
	Marlin/motion_control.cpp
---

800501b50f88d012ec9786d75dff98dfb43f4a7b