]> arthur.barton.de Git - netatalk.git/commitdiff
MachineType string is up to 16 characters
authorHAT <hat@fa2.so-net.ne.jp>
Thu, 14 Jul 2011 15:01:13 +0000 (00:01 +0900)
committerHAT <hat@fa2.so-net.ne.jp>
Thu, 14 Jul 2011 15:01:13 +0000 (00:01 +0900)
Merge remote-tracking branch 'remotes/origin/branch-netatalk-2-1'

1  2 
etc/afpd/auth.c
etc/afpd/status.c

diff --cc etc/afpd/auth.c
Simple merge
Simple merge