Merge commit 'upstream/3.2.1'
authorBdale Garbee <bdale@gag.com>
Sun, 27 Feb 2011 17:55:50 +0000 (10:55 -0700)
committerBdale Garbee <bdale@gag.com>
Sun, 27 Feb 2011 17:55:50 +0000 (10:55 -0700)
commitcb38d19aa8dc2c5d380ab2d7ad9724a5d99eee5d
treec701c8aec5ca7a35320f65c0542ea3789b97601a
parentc21061ed466e7ee71cb21dd35010e33f6cf76424
parent011a59f5a54864108a16af570a6b287410597cc2
Merge commit 'upstream/3.2.1'
man/amanda.conf.5
man/disklist.5
man/xml-source/amanda.conf.5.xml