Fixed: Wrong value for delete status in imscp-setup-methods.pl
Merge branch 'upstream-master'
Merge branch 'master' into fixes-20130324

Conflicts:
	engine/setup/imscp-setup-methods.pl