From 4812f4ce0fc59e43eb06972a7c53cbff4b971bbb Mon Sep 17 00:00:00 2001
From: Marc Delisle <marc@infomarc.info>
Date: Fri, 11 Feb 2011 12:53:01 -0500
Subject: [PATCH 1/3] 3.3.9.2 ChangeLog

---
 ChangeLog | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index d7e104f53..5b48a0636 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,9 @@ phpMyAdmin - ChangeLog
 $Id$
 $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyAdmin/ChangeLog $
 
+3.3.9.2 (2011-02-11)
+- [security] SQL injection, see PMASA-2011-2
+
 3.3.9.1 (2011-02-08)
 - [security] Path disclosure, see PMASA-2011-1
 

From fdfcd5b9bde61eacace6aa8be58723e0adc1205e Mon Sep 17 00:00:00 2001
From: Marc Delisle <marc@infomarc.info>
Date: Fri, 11 Feb 2011 12:55:02 -0500
Subject: [PATCH 2/3] 3.3.9.2 release

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

diff --git a/Documentation.html b/Documentation.html
index ad4e95133..faffa0c9d 100644
--- a/Documentation.html
+++ b/Documentation.html
@@ -10,7 +10,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.3.9.1 - Documentation</title>
+    <title>phpMyAdmin 3.3.9.2 - Documentation</title>
     <link rel="stylesheet" type="text/css" href="docs.css" />
 </head>
 
@@ -18,7 +18,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.3.9.1 
+        3.3.9.2 
         Documentation
     </h1>
 </div>
diff --git a/README b/README
index aeb211b08..2318189d6 100644
--- a/README
+++ b/README
@@ -5,7 +5,7 @@ phpMyAdmin - Readme
 
   A set of PHP-scripts to manage MySQL over the web.
 
-  Version 3.3.9.1
+  Version 3.3.9.2
   ---------------
   http://www.phpmyadmin.net/
 
diff --git a/libraries/Config.class.php b/libraries/Config.class.php
index 89a80d20c..e0f9523d6 100644
--- a/libraries/Config.class.php
+++ b/libraries/Config.class.php
@@ -92,7 +92,7 @@ class PMA_Config
      */
     function checkSystem()
     {
-        $this->set('PMA_VERSION', '3.3.9.1');
+        $this->set('PMA_VERSION', '3.3.9.2');
         /**
          * @deprecated
          */
diff --git a/translators.html b/translators.html
index ebb9f5126..ff9bd4ff1 100644
--- a/translators.html
+++ b/translators.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=utf-8" />
-    <title>phpMyAdmin 3.3.9.1 - Official translators</title>
+    <title>phpMyAdmin 3.3.9.2 - Official translators</title>
     <link rel="stylesheet" type="text/css" href="docs.css" />
 </head>
 
@@ -19,7 +19,7 @@
 <div id="header">
     <h1>
         <a href="http://www.phpmyadmin.net/">php<span class="myadmin">MyAdmin</span></a>
-        3.3.9.1 
+        3.3.9.2 
         official translators list
     </h1>
 </div>

From e1653263885f3d40cbf67747434b1d17bb90622b Mon Sep 17 00:00:00 2001
From: Marc Delisle <marc@infomarc.info>
Date: Sat, 12 Feb 2011 13:37:11 -0500
Subject: [PATCH 3/3] Reference to minor security fixes

---
 ChangeLog | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ChangeLog b/ChangeLog
index 012d19eb1..d1443056e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -12,6 +12,7 @@ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyA
   thanks to Madhura Jayaratne - madhuracj 
 - bug #3153409 [core] 0 row(s) affected 
 - bug #3155842 [core] Edit relational page and page number
+- [security] Minor security fixes, see PMASA-2010-9 and PMASA-2010-10
 
 3.3.9.2 (2011-02-11)
 - [security] SQL injection, see PMASA-2011-2