EBox::Validate::checkEmailAddress does not ignore ant longer white spaces  at the begin and end og the address
Fixed bug which allowed to use incorrect external addresses in  fetchmail accounts
removed internationalization from log file warnings
Merge branch 'jag/mail-bad-external-addr' into 3.0

Conflicts:
	main/mail/ChangeLog
Merge pull request #547 from Zentyal/jag/nol10n-warnings

DHCP fixed addresses: removed internationalization from log file warnings
updated core depend
releasing core 3.0.25
releasing dns 3.0.11
releasing remoteservices 3.0.25
Look for ssl.cert instead of ssl.pem in Slave::soapClient()
Added 'E-Mail' field to users and groups. Fixed userssync code to use the new fields and improvements on the way we sync empty attributes
Merge pull request #558 from Zentyal/jacalvo/fix-masterslave-cert

Look for ssl.cert instead of ssl.pem in Slave::soapClient()
Merge branch '3.0'

Conflicts:
	main/common/ChangeLog
	main/core/ChangeLog
	main/core/debian/precise/changelog
	main/dns/debian/precise/changelog
	main/dns/debian/precise/control
	main/mail/ChangeLog
	main/mail/src/EBox/Mail/CGI/AddExternalAccount.pm
	main/remoteservices/debian/precise/changelog
	main/remoteservices/debian/precise/control
	main/users/ChangeLog
Fixed typos
Merge branch 'master' into cperello/s4sync-fixes

Conflicts:
	main/users/ChangeLog
Merge pull request #559 from Zentyal/cperello/s4sync-fixes

Cperello/s4sync fixes
Removed the .pc links to avoid conflicts with distro packages
Fixed bad usage of OpenLDAP when it should be using LDB. Force a trace back printing when an LDB connection is not possible.
Merge branch 'master' into cperello/fix-samba-permissions

Conflicts:
	main/common/ChangeLog
	main/samba/ChangeLog
Merge pull request #560 from Zentyal/cperello/samba4-packaging-fixes

Removed the .pc links to avoid conflicts with distro packages