Remove trailing white spaces
bug #4088 MySQL server version at index.php incorrect w/ controlhost
Merge branch 'QA_4_0' of github.com:phpmyadmin/phpmyadmin into QA_4_0

Conflicts:
	ChangeLog