From: HAT <hat@fa2.so-net.ne.jp>
Date: Sat, 4 Jun 2011 16:34:36 +0000 (+0900)
Subject: Merge remote-tracking branch 'remotes/origin/branch-netatalk-2-1'
X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4054f4b3c85ecab060dafd46c0d3632cadbb5803;hp=4054f4b3c85ecab060dafd46c0d3632cadbb5803;p=netatalk.git

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