Merge commit 'upstream/3.3.0'

diff --cc client-src/selfcheck.c
Simple merge

diff --cc example/amanda.conf.in
Simple merge

diff --cc gnulib/regenerate/regenerate
index 57565d78ef319fba1b4e6e6531188524d94c25cd,d7f3a97c80985ed2a24666461d40b79580d58c1a..d7f3a97c80985ed2a24666461d40b79580d58c1a
mode 100644,100755..100644
--- 1/gnulib/regenerate/regenerate
--- 2/gnulib/regenerate/regenerate
+++ b/gnulib/regenerate/regenerate

diff --cc man/amanda.conf.5
Simple merge

diff --cc man/disklist.5
Simple merge

diff --cc man/xml-source/amanda.conf.5.xml
Simple merge

diff --cc server-src/diskfile.h
Simple merge