From: Frank Lahm <franklahm@googlemail.com>
Date: Tue, 25 May 2010 14:35:39 +0000 (+0200)
Subject: Merge branch-2-1
X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?p=netatalk.git;a=commitdiff_plain;h=4d78f16c0b774102acbf5bd020440c73f606752e

Merge branch-2-1
---

4d78f16c0b774102acbf5bd020440c73f606752e