diff --git a/ChangeLog b/ChangeLog
index b13530334..34dfd8ddc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,8 @@ phpMyAdmin - ChangeLog
$Id$
$HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyAdmin/ChangeLog $
+3.1.5.0 (not yet released)
+
3.1.4.0 (not yet released)
+ patch #1808339 [doc] Apache SSLOptions and StdEnvVars FAQ,
thanks to JT Justman - jtjustman
diff --git a/Documentation.html b/Documentation.html
index 6b4250f7b..bd5ba1aa8 100644
--- a/Documentation.html
+++ b/Documentation.html
@@ -11,7 +11,7 @@
-
phpMyAdmin 3.1.4-dev - Documentation
+ phpMyAdmin 3.1.5-dev - Documentation
@@ -33,7 +33,7 @@
Glossary
-phpMyAdmin 3.1.4-dev Documentation
+phpMyAdmin 3.1.5-dev Documentation
-
phpMyAdmin homepage
diff --git a/README b/README
index e7ae3af79..b9c7af030 100644
--- a/README
+++ b/README
@@ -5,7 +5,7 @@ phpMyAdmin - Readme
A set of PHP-scripts to manage MySQL over the web.
- Version 3.1.4-dev
+ Version 3.1.5-dev
-----------------
http://www.phpmyadmin.net/
diff --git a/libraries/Config.class.php b/libraries/Config.class.php
index 2b3eb6b60..4865315b6 100644
--- a/libraries/Config.class.php
+++ b/libraries/Config.class.php
@@ -85,7 +85,7 @@ class PMA_Config
*/
function checkSystem()
{
- $this->set('PMA_VERSION', '3.1.4-dev');
+ $this->set('PMA_VERSION', '3.1.5-dev');
/**
* @deprecated
*/
diff --git a/translators.html b/translators.html
index 7621f2ca7..fffb6b6b0 100644
--- a/translators.html
+++ b/translators.html
@@ -8,7 +8,7 @@
- phpMyAdmin 3.1.4-dev - Official translators
+ phpMyAdmin 3.1.5-dev - Official translators
@@ -31,7 +31,7 @@
- Glossary
-phpMyAdmin 3.1.4-dev official translators list
+phpMyAdmin 3.1.5-dev official translators list
Here is the list of the "official translators" of
phpMyAdmin.