]> arthur.barton.de Git - netatalk.git/commit
Merge remote-tracking branch 'origin/branch-netatalk-3-0' into develop
authorRalph Boehme <sloowfranklin@gmail.com>
Tue, 9 Jul 2013 13:45:29 +0000 (15:45 +0200)
committerRalph Boehme <sloowfranklin@gmail.com>
Tue, 9 Jul 2013 13:45:29 +0000 (15:45 +0200)
commitf83f282ad91f8b8c3162afbf99836033b4e64c52
tree573c5d76a91395fca4ca2a8e9b24df568abe9b11
parentb43711ba37813b7f879a7dea668bd0d95dadf5c8
parente03725a36d1f1f0d68f211aa700a7abc82608169
Merge remote-tracking branch 'origin/branch-netatalk-3-0' into develop

Conflicts:
libatalk/util/netatalk_conf.c
NEWS
libatalk/util/netatalk_conf.c