4.2.5-dev

Signed-off-by: Marc Delisle <marc@infomarc.info>
Merge commit 'd4f754c' into QA_4_2
Fix merge conflicts

Signed-off-by: Marc Delisle <marc@infomarc.info>
4.2.4 release

Signed-off-by: Marc Delisle <marc@infomarc.info>
bug #4467 shell_exec() has been disabled for security reasons

Signed-off-by: Marc Delisle <marc@infomarc.info>
Fix error when clicking 'Go' and having an empty textarea in SQL tab.

Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
ChangeLog entry

Signed-off-by: Marc Delisle <marc@infomarc.info>
Fix coding style

Signed-off-by: Ann + J.M <phpMyAdmin@ZweiSteinSoft.de>
Translated using Weblate (Azerbaijani)

Currently translated at 29.7% (824 of 2770)
Translated using Weblate (Korean)

Currently translated at 82.1% (2276 of 2770)
Translated using Weblate (Norwegian Bokmål)

Currently translated at 61.5% (1705 of 2770)
Merge remote-tracking branch 'origin/QA_4_2' into QA_4_2
Fix failing tests

Signed-off-by: Ann + J.M <phpMyAdmin@ZweiSteinSoft.de>
Merge pull request #1247 from Tithugues/QA_4_2_fixEmptySQL

Fix error when clicking 'Go' and having an empty textarea in SQL tab. (bug #4470)
Update ChangeLog.

Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
Fix coding style

Signed-off-by: Ann + J.M <phpMyAdmin@ZweiSteinSoft.de>
Translated using Weblate (Azerbaijani)

Currently translated at 31.0% (860 of 2770)
Merge remote-tracking branch 'origin/QA_4_2' into QA_4_2
Add missing include. (bug #4463)

Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
Merge pull request #1248 from Tithugues/QA_4_2_b4463

Add missing include. (bug #4463)