Merge commit 'upstream/3.2.0'
authorBdale Garbee <bdale@gag.com>
Tue, 2 Nov 2010 02:41:50 +0000 (20:41 -0600)
committerBdale Garbee <bdale@gag.com>
Tue, 2 Nov 2010 02:41:50 +0000 (20:41 -0600)
commit42ff24f2a525d5965e1841b2ebe3ee0f4b918ac6
tree9a5c3246d014c9431db03b4d4c2dbcad0ab90456
parentc88ee0799dbba0d855be48a5c148c4586400b142
parentb116e9366c7b2ea2c2eb53b0a13df4090e176235
Merge commit 'upstream/3.2.0'

Conflicts:
changer-src/chg-mcutil.sh
client-src/selfcheck.c
example/amanda.conf.in
example/template.d/dumptypes
gnulib/regenerate/regenerate
man/amanda.conf.5
man/disklist.5
man/entities/global.entities.in
man/xml-source/amanda.conf.5.xml
server-src/diskfile.h