From: ErikZalm <erik@vdzalm.eu>
Date: Wed, 16 May 2012 19:21:48 +0000 (-0700)
Subject: Merge pull request #164 from guanix/Marlin_v1
X-Git-Tag: iwj-success-2012-07-29~25^2
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=804e0d611786e0434662d15c6965140165192f3d;p=marlin.git

Merge pull request #164 from guanix/Marlin_v1

Melzi support
---

804e0d611786e0434662d15c6965140165192f3d