Merge pull request #696 from scnakandala/refac_tbl_add_field

Refactoring tbl_addfield.php
Fix failing test
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
Merge branch 'QA_4_0'

Conflicts:
	libraries/database_interface.lib.php
bug #4087 Undefined index query
Fix codestyle
wrap long lines
remove trailing space
UTs for PMA_server_privileges
bug #4068 Headline in operations not readable in IE10
Merge branch 'master' of github.com:phpmyadmin/phpmyadmin
refactor the code style
Merge pull request #689 from ayushchd/ut_fix

Fix date-second issue with Tracker tests
add Unit test cases for PMA_tbl_indexes
Merge pull request #698 from adamgsoc2013/UnitTestCases

add Unit test cases for PMA_tbl_indexes
Translated using Weblate (English (United Kingdom))

Currently translated at 96.3% (2620 of 2720)
Translated using Weblate (Korean)

Currently translated at 70.4% (1916 of 2720)
Merge remote-tracking branch 'origin/master'