Merge branch 'jbahillo/squid-keytab-perm'

Conflicts:
	main/squid/ChangeLog
Time ACLs had a independent id. Dont repeat ACL declaration
typo error
Fixing typo reported in #348
Merge pull request #349 from Zentyal/jjgarcia/typo-fixed

Fixing typo reported in #348
Merge branch 'jag/3.0-squid-timeoverlap-acl-fixes' into 3.0

Conflicts:
	main/squid/ChangeLog
Fix hostname change when having Samba installed.
Fixed a typo
added missing use
up ChangeLog
Merge pull request #352 from Zentyal/cperello/nginx-fixes

Fixed a typo
fixed indentation
Merge pull request #353 from Zentyal/jag/captiveportal-missing-use

Added missing use sentence to Users Model
Merge pull request #351 from Zentyal/jsalamero/fix-hostname-change-samba

Fix hostname change when having Samba installed.
Merge branch '3.0'

Conflicts:
	main/samba/ChangeLog
	main/squid/ChangeLog
 Added missing use declaration in rules model
Merge pull request #356 from Zentyal/jag/3.0-ids-missinguse

3.0 ids - Added missing use declaration in rules model
Fixed error message when trying to add a user above the edition maximum

Conflicts:
	main/users/ChangeLog
Merge branch '3.0'

Conflicts:
	main/users/ChangeLog
Fix NFQUEUE clashing with l7filter from trafficshaping module