Delete old vscan mason template
Do not create quarantine share if antivirus is disabled
Merge branch 'master' into scabrero/samba-quarantine-perms
added missing changelog entry
Fixing logs of the samba virus and quarantine sections
fixed permissions problem trying to scan shares as ebox user

now it is done as root

also includes other fixes like properly handling if clamav is not running and rotation of the log
Merge pull request #133 from Zentyal/scabrero/samba-quarantine-perms

Scabrero/samba quarantine perms
Avoid exception in subscription info table when a  no subscribed server use no-ascii character set
 Fixed encoding of language select list
Merge pull request #136 from Zentyal/jag/ltsp-utf8-lanugage-list

 Fixed encoding of language select list
Merge branch 'jag/remoteservices-noascci-subscriptioninfo'

Conflicts:
	main/remoteservices/ChangeLog
Merge branch 'master' into scabrero/samba-ad-migrate

Conflicts:
	main/samba/ChangeLog
	main/samba/src/EBox/Samba.pm
	main/samba/stubs/smb.conf.mas