Merge commit 'upstream/3.3.0'
authorBdale Garbee <bdale@gag.com>
Sun, 7 Aug 2011 08:04:09 +0000 (02:04 -0600)
committerBdale Garbee <bdale@gag.com>
Sun, 7 Aug 2011 08:04:09 +0000 (02:04 -0600)
commitb221e8dc16f345f8c8d7df8df71f4d36daaabb4c
tree6443b642272948b8bb69254363daa8d5d790c5b1
parentc16b04cb8ba646250049afa94e22e7a800b94e7d
parentcd0b924f27312d57bd42f6c4fae2b795139e2d0b
Merge commit 'upstream/3.3.0'
client-src/selfcheck.c
example/amanda.conf.in
gnulib/regenerate/regenerate
man/amanda.conf.5
man/disklist.5
man/xml-source/amanda.conf.5.xml
server-src/diskfile.h