[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0ALPHA1-2842-gad1468c

[Marc Delisle]

The branch, master has been updated
       via  ad1468c8a2a04efa8b144ac8b4da638052a6e868 (commit)
       via  05931126744134ff1aa13e7104c87d428a756daf (commit)
       via  dff18d6af8c8bbc8ed13cd4032d5cfe4640811ea (commit)
      from  46b1276052ef6fd88dce0184c3e880b4d695359b (commit)


- Log -----------------------------------------------------------------
commit ad1468c8a2a04efa8b144ac8b4da638052a6e868
Merge: 46b1276052ef6fd88dce0184c3e880b4d695359b 05931126744134ff1aa13e7104c87d428a756daf
Author: Marc Delisle <marc at infomarc.info>
Date:   Mon Nov 29 13:03:29 2010 -0500

    Merge branch 'QA_3_4'

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 5e63850..b9e81a8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -135,8 +135,8 @@
 - patch #3117535 [replication] Add quotes to database in initial statement,
   thanks to Craig Duncan - duncan3dc
 
-3.3.8.1 (2010-10-26)
-- bug #3115519 (private) [security] XSS on db search
+3.3.8.1 (2010-11-29)
+- bug #3115519 (private) [security] XSS on db search, see PMASA-2010-8
 
 3.3.8.0 (2010-10-25)
 - bug #3059311 [import] BIGINT field type added to table analysis


hooks/post-receive
-- 
phpMyAdmin