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

ChangeLog

@@ -1,7 +1,9 @@
 phpMyAdmin - ChangeLog
 ======================
 
-4.1.3.0 (not yet released)
+4.1.4.0 (not yet released)
+
+4.1.3.0 (2013-12-31)
 - bug #3938 PDFDefaultPageSize doc and easy configurability
 - bug #4198 Hovering over pie chart gives fatal JS error
 - bug #4200 Missing syntax highlighting

README

@@ -1,7 +1,7 @@
 phpMyAdmin - Readme
 ===================
 
-Version 4.1.3-dev
+Version 4.1.4-dev
 
 A set of PHP-scripts to manage MySQL over the web.
 
@@ -13,7 +13,7 @@ Copyright
 Copyright (C) 1998-2000
     Tobias Ratschiller <tobias_at_ratschiller.com>
 
-Copyright (C) 2001-2013
+Copyright (C) 2001-2014
     Marc Delisle <marc_at_infomarc.info>
     Olivier Müller <om_at_omnis.ch>
     Robin Johnson <robbat2_at_users.sourceforge.net>

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.3-dev'
+version = '4.1.4-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.3-dev');
+        $this->set('PMA_VERSION', '4.1.4-dev');
         /**
          * @deprecated
          */