Merge remote-tracking branch 'origin/master'

2013-10-04 11:37:21 +02:00 · 2013-10-04 11:37:21 +02:00 · 6453d498dd
commit 6453d498dd
parent 781158d9c4 850cfad723
3 changed files with 3 additions and 3 deletions
--- a/2
+++ b/2
@ -1,7 +1,7 @@
 phpMyAdmin - Readme
 ===================

-Version 4.1.0-alpha1
+Version 4.1.0-alpha2

 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.1.0-alpha1'
+version = '4.1.0-alpha2'
 # The full version, including alpha/beta/rc tags.
 release = version

--- a/libraries/Config.class.php
+++ b/libraries/Config.class.php
@ -102,7 +102,7 @@ class PMA_Config
     */
    function checkSystem()
    {
-        $this->set('PMA_VERSION', '4.1.0-alpha1');
+        $this->set('PMA_VERSION', '4.1.0-alpha2');
        /**
         * @deprecated
         */