From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sat, 4 Aug 2012 14:41:25 +0000 (+0100)
Subject: update from ref for-upstream (merge -s theirs)
X-Git-Tag: firmware-tested-2012-08-04~5^2
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=24020d0819040e2a5f2baeb01f2e207e3a3d6dd0;p=marlin.git

update from ref for-upstream (merge -s theirs)
---

24020d0819040e2a5f2baeb01f2e207e3a3d6dd0