Merge remote-tracking branch 'origin/QA_4_1' into QA_4_1

ChangeLog

@@ -1,7 +1,9 @@
 phpMyAdmin - ChangeLog
 ======================
 
-4.1.4.0 (not yet released)
+4.1.5.0 (not yet released)
+
+4.1.4.0 (2014-01-07)
 - bug #3840 (additional fix) When exporting to gzip format, the data is compressed 2 times
 - bug #4209 Missing compression in one case
 - bug #4208 Can't browse tables after sorting on columns with fieldnames that have a '-'

README

@@ -1,7 +1,7 @@
 phpMyAdmin - Readme
 ===================
 
-Version 4.1.4-dev
+Version 4.1.5-dev
 
 A set of PHP-scripts to manage MySQL over the web.
 

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.4-dev'
+version = '4.1.5-dev'
 # The full version, including alpha/beta/rc tags.
 release = version
 

libraries/Config.class.php

@@ -114,7 +114,7 @@ class PMA_Config
      */
     function checkSystem()
     {
-        $this->set('PMA_VERSION', '4.1.4-dev');
+        $this->set('PMA_VERSION', '4.1.5-dev');
         /**
          * @deprecated
          */