From: Frank Lahm <franklahm@googlemail.com>
Date: Mon, 6 Jun 2011 14:08:48 +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=154c130f7a3a407e686eda99a6658773e137b05f

Merge branch-2-1
---

154c130f7a3a407e686eda99a6658773e137b05f