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

Merge branch 'for-upstream-ff' into iwj
---

f3d77bfd31768b978b81deda8c44a1350e20c12f