From 8b48c1998d9f898a17b810ccaa396ae4da863176 Mon Sep 17 00:00:00 2001
From: Marc Delisle <marc@infomarc.info>
Date: Tue, 7 Jun 2011 08:11:12 -0400
Subject: [PATCH] 3.4.2 release

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

diff --git a/ChangeLog b/ChangeLog
index a3a13c11a7..945c547a0c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,7 @@
 phpMyAdmin - ChangeLog
 ======================
 
-3.4.2.0 (not yet released)
+3.4.2.0 (2011-06-07)
 - bug #3301249 [interface] Iconic table operations does not remove inline edit label
 - bug #3303869 [interface] Unnecessary scrolling on Databases page
 - patch #3303813 [setup] Define a label that was missing
diff --git a/Documentation.html b/Documentation.html
index 20a49e7f78..3531ef680e 100644
--- a/Documentation.html
+++ b/Documentation.html
@@ -9,7 +9,7 @@ vim: expandtab ts=4 sw=4 sts=4 tw=78
     <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.4.2-rc1 - Documentation</title>
+    <title>phpMyAdmin 3.4.2 - Documentation</title>
     <link rel="stylesheet" type="text/css" href="docs.css" />
 </head>
 
@@ -17,7 +17,7 @@ vim: expandtab ts=4 sw=4 sts=4 tw=78
 <div id="header">
     <h1>
         <a href="http://www.phpmyadmin.net/">php<span class="myadmin">MyAdmin</span></a>
-        3.4.2-rc1
+        3.4.2
         Documentation
     </h1>
 </div>
diff --git a/README b/README
index b8f1712f9c..a6529940f3 100644
--- a/README
+++ b/README
@@ -1,7 +1,7 @@
 phpMyAdmin - Readme
 ===================
 
-Version 3.4.2-rc1
+Version 3.4.2
 
 A set of PHP-scripts to manage MySQL over the web.
 
diff --git a/libraries/Config.class.php b/libraries/Config.class.php
index 2e3a01fe7c..67c8ed1b38 100644
--- a/libraries/Config.class.php
+++ b/libraries/Config.class.php
@@ -96,7 +96,7 @@ class PMA_Config
      */
     function checkSystem()
     {
-        $this->set('PMA_VERSION', '3.4.2-rc1');
+        $this->set('PMA_VERSION', '3.4.2');
         /**
          * @deprecated
          */
-- 
2.11.4.GIT