]> arthur.barton.de Git - netatalk.git/commitdiff
afpd.conf.tmpl: Merge remote-tracking branch 'remotes/origin/branch-netatalk-2-1'
authorHAT <hat@fa2.so-net.ne.jp>
Tue, 8 Mar 2011 16:49:33 +0000 (01:49 +0900)
committerHAT <hat@fa2.so-net.ne.jp>
Tue, 8 Mar 2011 16:49:33 +0000 (01:49 +0900)
1  2 
config/afpd.conf.tmpl

Simple merge