From: Frank Lahm <franklahm@googlemail.com>
Date: Sat, 18 Jun 2011 10:45:01 +0000 (+0200)
Subject: Merge sf
X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?p=netatalk.git;a=commitdiff_plain;h=bea0c55cc833ccc859c8a9413d52af5c61cf3593

Merge sf
---

bea0c55cc833ccc859c8a9413d52af5c61cf3593