]> arthur.barton.de Git - netatalk.git/commit - etc/afpd/main.c
Merge remote-tracking branch 'origin/branch-netatalk-3-0' into develop
authorRalph Boehme <sloowfranklin@gmail.com>
Fri, 21 Jun 2013 09:48:27 +0000 (11:48 +0200)
committerRalph Boehme <sloowfranklin@gmail.com>
Fri, 21 Jun 2013 09:48:27 +0000 (11:48 +0200)
commitb6a549f945245c8e31e3fb1533ee7d811c5a4bb1
treed2bee1be40a37bb7458c9db5adbca15488c32c9f
parent98ada4ea7939f7559444be02961c4edb612f44f8
parent685d323a7d60177b429c0ca27c996c90a14a244d
Merge remote-tracking branch 'origin/branch-netatalk-3-0' into develop
libatalk/util/netatalk_conf.c