default value for @printers
default value for @printers
When creating domains take in account SLD
Added clamd socket actions to freshclam apparmor profile
releasing core 3.3.6
Fixing zentyal-ppa-build script to use git checkout instead of an alias
Setup mail account on enable for users that already have mail attribute
Better packaging for EBox::Event::Watcher::CaptivePortalQuota
Hide passwords on admin user model on error and debug on

As they are external exceptions are shown to the user without dumping it to the log
Do not launch exceptions on EBox::MyDBEngine DESTROY

Never do this again...

(cherry picked from commit f43b8cf641b9c267039c0d92dada20e3356e7bd7)

Conflicts:
	main/core/ChangeLog
Merge pull request #1184 from Zentyal/jag/freshclam-apaprmor-clam-socket

Added clamd socket actions to freshclam apparmor profile
Merge branch 'ejhernandez/admin-user-hide-password-on-error' into 3.3

Conflicts:
	main/core/ChangeLog
Merge pull request #1182 from Zentyal/jag/webserver-sld

When creating domains take in account SLD
Merge pull request #1199 from Zentyal/jag/3.2-captiveportal-pkg-watcher

Jag/3.2 captiveportal pkg watcher
Merge branch '3.2' into 3.3

Conflicts:
	main/antivirus/ChangeLog
	main/captiveportal/ChangeLog
	main/mail/ChangeLog
	main/webserver/ChangeLog
	main/webserver/debian/precise/control
Merge branch '3.3'

Conflicts:
	extra/scripts/zentyal-ppa-build.sh
	main/antivirus/ChangeLog
	main/core/ChangeLog
	main/core/debian/changelog
	main/core/src/EBox/SysInfo/Model/AdminUser.pm
	main/mail/ChangeLog
	main/webserver/ChangeLog
	main/webserver/debian/control