Conflicts:
	packages/build-server.sh
	src/warden-server/bin/wardenWatchdog.pl
	src/warden-server/doc/CHANGELOG
	src/warden-server/doc/README
	src/warden-server/lib/Warden.pm
	src/warden-server/sh/uninstall.sh
	src/warden-server/sh/update.sh