Merge tag 'upstream/3.3.2'
authorBdale Garbee <bdale@gag.com>
Mon, 8 Oct 2012 23:48:35 +0000 (17:48 -0600)
committerBdale Garbee <bdale@gag.com>
Mon, 8 Oct 2012 23:48:35 +0000 (17:48 -0600)
commit109540caa4e37a3663b3dcfb9a205b9609e3f561
treeae7a050754f01b71eb987a8a2f5f6f5926d8758e
parent4c9eba1feb11adf189bceb4001c425e641f0b56a
parent949b8910a5e23c4285d0b1aedacfc82a14dc97a5
Merge tag 'upstream/3.3.2'

Upstream version 3.3.2

Conflicts:
common-src/glib-util.c
perl/Amanda/Header.pm
client-src/selfcheck.c
common-src/glib-util.c
debian/patches/series
man/amanda.conf.5
man/disklist.5
man/xml-source/amanda.conf.5.xml
man/xml-source/disklist.5.xml
server-src/diskfile.h