implementation of feature request #1363
typo fix
Merge branch 'master' of https://github.com/phpmyadmin/phpmyadmin.git into profiler3
Dead code
Dead code
Dead code
Dead code
bug #3917 CountTables directive is deprecated
table title updates
Upgrade CodeMirror to 3.13
Increase test timeout
Translated using Weblate (Dutch)

Currently translated at 99.8% (2654 of 2660)
Merge remote-tracking branch 'origin/master'
bug #3948 Server export problems
Translated using Weblate (Slovenian)

Currently translated at 100.0% (2607 of 2607)
Merge remote-tracking branch 'origin/QA_4_0' into QA_4_0
Merge branch 'QA_4_0'
Merge commit '6d890c362698ca74b9aa5c928923c5f8aa22267b' into QA_4_0

Conflicts:
	ChangeLog
Merge commit '7c641c364694f889874605ff7961a0522bfc12da'
Merge remote-tracking branch 'origin/QA_4_0'

Conflicts:
	libraries/config/messages.inc.php