]> arthur.barton.de Git - netatalk.git/commit
Merge remote-tracking branch 'origin/branch-netatalk-3-0' into develop
authorRalph Boehme <sloowfranklin@gmail.com>
Tue, 22 Oct 2013 18:02:59 +0000 (20:02 +0200)
committerRalph Boehme <sloowfranklin@gmail.com>
Tue, 22 Oct 2013 18:02:59 +0000 (20:02 +0200)
commit22a32e7449133013789f3fc7ff6b32772b0c76cc
treea003d06a77a1f13d1049eac82ee93509e50408a8
parent130d356c840ea83c31c4724c8ae92660360eb07b
parenta471b52a918ae6ab59589b93b890fa0c08080b92
Merge remote-tracking branch 'origin/branch-netatalk-3-0' into develop

Conflicts:
configure.ac
libatalk/Makefile.am
NEWS
configure.ac
libatalk/Makefile.am
macros/netatalk.m4
macros/summary.m4