allows no-overlapping time periods for objects or group rules
better doc and error message
fixed case of source type in message
up ChangeLog
missing ";"

Conflicts:
	main/mailfilter/stubs/amavisd.conf.mas
added pyzor dependency
cherry-pickL removed idle ebox.spamd, this has fixed the file ownership prolbems with pyzor and razor2

Conflicts:
	main/mailfilter/src/EBox/MailFilter/SpamAssassin.pm
	main/mailfilter/stubs/local.cf.mas
updated changelog. Remove remains of spamd daemon
reformat
migration to get rid of ebox.spamd instances
added spf dependency, enable dkim
remove superfluous laod plugin dkim
Change to debug remote support no conf message
Fixing error in a next, missing if
vlanes are removed when trunk interface is not trunmk anymore
Two fixes in unsubscription process

* Remove CA file properly from Apache module
Two fixes in Apache remove* methods

+ Avoid CA file check when removing it from Apache module
+ Silent removeCA and removeInclude exceptions when removing
  non-existant element
updated
Merge pull request #221 from Zentyal/jag/network-remove-trunk

 Remove attached vlans when a interface is not longer trunkJag/network remove trunk
added missing ~