From: ErikZalm <erik@vdzalm.eu>
Date: Thu, 12 Apr 2012 12:29:24 +0000 (-0700)
Subject: Merge pull request #140 from daid/Marlin_v1
X-Git-Tag: iwj-success-2012-07-29~38
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=939f1fab464b908b169835adc71ee943303936b0;p=marlin.git

Merge pull request #140 from daid/Marlin_v1

Fix for wrong systax in #ifdef.
---

939f1fab464b908b169835adc71ee943303936b0