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)
1  2 
man/amanda.conf.5
man/disklist.5
man/xml-source/amanda.conf.5.xml

Simple merge
diff --cc man/disklist.5
Simple merge
Simple merge