Merge remote-tracking branch 'origin/master'

2013-03-17 11:59:39 +01:00 · 2013-03-17 11:59:39 +01:00 · 46e6233370
commit 46e6233370
parent a1ad1a9ce7 9158580da5
3 changed files with 3 additions and 3 deletions
--- a/2
+++ b/2
@ -1,7 +1,7 @@
 phpMyAdmin - Readme
 ===================

-Version 4.0.0-beta1
+Version 4.0.0-beta2

 A set of PHP-scripts to manage MySQL over the web.

--- a/doc/conf.py
+++ b/doc/conf.py
@ -49,7 +49,7 @@ copyright = u'2012 - 2013, The phpMyAdmin devel team'
 # built documents.
 #
 # The short X.Y version.
-version = '4.0.0-beta1'
+version = '4.0.0-beta2'
 # The full version, including alpha/beta/rc tags.
 release = version

--- a/libraries/Config.class.php
+++ b/libraries/Config.class.php
@ -101,7 +101,7 @@ class PMA_Config
     */
    function checkSystem()
    {
-        $this->set('PMA_VERSION', '4.0.0-beta1');
+        $this->set('PMA_VERSION', '4.0.0-beta2');
        /**
         * @deprecated
         */