Fixing syntax error in control file
releasing zentyal-ips 3.0.1
Bridges already used are skipped instead of reused to avoid conflicts
fixed lack of permissions problem
Fixed encoding of parameters in confirmation dialogs
Merge pull request #480 from Zentyal/jag/3.0-fix-confirmation-dialog-encoding

Fixed encoding of parameters in confirmation dialogs
Fix previous commit and delete unsued networks.
Merge pull request #482 from Zentyal/jacalvo/virt-bridges

Jacalvo/virt bridges
Do not check for r/rw perms on disks as libvirt automatically fixes them
Include back read permissions that are needed to check file type.
Merge branch 'jsalamero/virt-fix-adhd' into 3.0

Conflicts:
	main/virt/ChangeLog
Fix bad translation in spannish string for succesful module installation
Merge branch '3.0'

Conflicts:
	main/core/www/js/table-helper.js
	main/ips/ChangeLog
	main/ips/debian/precise/changelog
	main/mailfilter/debian/precise/control
	main/virt/ChangeLog
Merge branch 'master' into cperello/fix-samba-permissions
Update from [MS-DTYP] document