Merge branch 'QA_4_2'

phpmyadmin · Jun 26, 2014 · beb5803 · beb5803
2 parents 39552e2 + 719527d
commit beb5803
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/ChangeLog b/ChangeLog
@@ -22,7 +22,7 @@ phpMyAdmin - ChangeLog
 
 4.2.6.0 (not yet released)
 
-4.2.5.0 (not yet released)
+4.2.5.0 (2014-06-26)
 - bug #4467 shell_exec() has been disabled for security reasons
 - bug #4470 Error while submitting empty query
 - bug #4463 Fatal error: Class 'PMA_DatabaseInterface' not found