From: Frank Lahm <franklahm@googlemail.com>
Date: Wed, 19 May 2010 05:32:23 +0000 (+0200)
Subject: Merge remote branch 'remotes/origin/branch-netatalk-2-1'
X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b1c0c596f5202083907f5e12c15b557192508bb1;p=netatalk.git

Merge remote branch 'remotes/origin/branch-netatalk-2-1'
---

b1c0c596f5202083907f5e12c15b557192508bb1