Include contents of /etc/resolv.conf in bug report
Merge branch '3.0' into 3.2
Merge branch '3.2'

Conflicts:
	main/core/ChangeLog
Fixed JS glitch which broke the dashboard periodical updates
Merge pull request #686 from Zentyal/jag/dashboard-update-fix

Fixed JS glitch which broke the dashboard periodical updates
Removing duplicated variable declaration
Merge pull request #687 from Zentyal/jjgarcia/removing-duplicated-line

Removing duplicated variable declaration