From: Bernhard <bkubicek@x201.(none)>
Date: Fri, 25 Nov 2011 21:14:36 +0000 (+0100)
Subject: Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into Marlin_v1
X-Git-Tag: iwj-success-2012-07-29~196
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=71ca78982bf789b448b56d017625e63def85978b;p=marlin.git

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

71ca78982bf789b448b56d017625e63def85978b