Merge commit 'upstream/2.6.1p2'
authorBdale Garbee <bdale@gag.com>
Thu, 26 Nov 2009 23:11:50 +0000 (16:11 -0700)
committerBdale Garbee <bdale@gag.com>
Thu, 26 Nov 2009 23:11:50 +0000 (16:11 -0700)
commite9de482962ca61612054c6e0382814b04e416129
treebbeae8c7185b6a601d7d69307a0e1ed0795ef531
parent3e9b502276de9d7e44246f164b39f365765d00c1
parent96f35b20267e8b1a1c846d476f27fcd330e0b018
Merge commit 'upstream/2.6.1p2'

Conflicts:
server-src/diskfile.c
client-src/selfcheck.c
man/amanda.conf.5
man/disklist.5
man/xml-source/amanda.conf.5.xml