From 14b5c19856f426fa2bc167bef7d3b66b7c1366ef Mon Sep 17 00:00:00 2001
From: Marc Delisle <marc@infomarc.info>
Date: Fri, 15 May 2009 16:28:09 +0000
Subject: [PATCH] 3.1.5 release

---
 ChangeLog                  | 2 +-
 Documentation.html         | 4 ++--
 README                     | 4 ++--
 libraries/Config.class.php | 2 +-
 translators.html           | 4 ++--
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 1605ca7e1..955f57ee6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,7 +5,7 @@ phpMyAdmin - ChangeLog
 $Id$
 $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyAdmin/ChangeLog $
 
-3.1.5.0 (not yet released)
+3.1.5.0 (2009-05-15)
 - patch #2739001 [export] XML does not allow spaces in element names, 
   thanks to Derek Schaefer - drummingds1
 - bug #2780722 [import] Incorrect maximum file size 
diff --git a/Documentation.html b/Documentation.html
index c08388b89..bd3680403 100644
--- a/Documentation.html
+++ b/Documentation.html
@@ -11,7 +11,7 @@
     <link rel="icon" href="./favicon.ico" type="image/x-icon" />
     <link rel="shortcut icon" href="./favicon.ico" type="image/x-icon" />
     <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
-    <title>phpMyAdmin 3.1.5-rc1 - Documentation</title>
+    <title>phpMyAdmin 3.1.5 - Documentation</title>
     <link rel="stylesheet" type="text/css" href="docs.css" />
 </head>
 
@@ -33,7 +33,7 @@
     <li><a href="#glossary">Glossary</a></li>
 </ul>
 
-<h1>phpMyAdmin 3.1.5-rc1 Documentation</h1>
+<h1>phpMyAdmin 3.1.5 Documentation</h1>
 
 <ul><li><a href="http://www.phpmyadmin.net/">
             phpMyAdmin homepage</a></li>
diff --git a/README b/README
index 20c8f4c6f..50aa87cad 100644
--- a/README
+++ b/README
@@ -5,8 +5,8 @@ phpMyAdmin - Readme
 
   A set of PHP-scripts to manage MySQL over the web.
 
-  Version 3.1.5-rc1
-  -----------------
+  Version 3.1.5
+  -------------
   http://www.phpmyadmin.net/
 
     Copyright (C) 1998-2000 Tobias Ratschiller <tobias_at_ratschiller.com>
diff --git a/libraries/Config.class.php b/libraries/Config.class.php
index f50f08be1..9185d15c2 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.5-rc1');
+        $this->set('PMA_VERSION', '3.1.5');
         /**
          * @deprecated
          */
diff --git a/translators.html b/translators.html
index 52d4294aa..bf8965bff 100644
--- a/translators.html
+++ b/translators.html
@@ -8,7 +8,7 @@
     <link rel="icon" href="./favicon.ico" type="image/x-icon" />
     <link rel="shortcut icon" href="./favicon.ico" type="image/x-icon" />
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-    <title>phpMyAdmin 3.1.5-rc1 - Official translators</title>
+    <title>phpMyAdmin 3.1.5 - Official translators</title>
     <link rel="stylesheet" type="text/css" href="docs.css" />
 </head>
 
@@ -31,7 +31,7 @@
     <li><a href="Documentation.html#glossary">Glossary</a></li>
 </ul>
 
-<h1>phpMyAdmin 3.1.5-rc1 official translators list</h1>
+<h1>phpMyAdmin 3.1.5 official translators list</h1>
 
 <p> Here is the list of the &quot;official translators&quot; of
     phpMyAdmin.</p>