[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_6RC1-21203-gba2159b

[Marc Delisle]

The branch, master has been updated
       via  ba2159baca78325d9b6f6819e59b5f5546f503cd (commit)
       via  f3f9122c67f0fb795d5906a0b8b05b3b0f088683 (commit)
       via  c6ae934260a6b571784588a32d7323609cbb61f9 (commit)
       via  7869e3c3b412d825e040bc5df18c6d0adc28f751 (commit)
      from  2e19a6753f51d7f73e8794af3dc71e65b04dbc6f (commit)


- Log -----------------------------------------------------------------
commit ba2159baca78325d9b6f6819e59b5f5546f503cd
Merge: 2e19a67 f3f9122
Author: Marc Delisle <marc at infomarc.info>
Date:   Sun Oct 16 06:22:18 2011 -0400

    Merge branch 'QA_3_4'

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

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

diff --git a/ChangeLog b/ChangeLog
index a139e6a..d897f63 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -60,7 +60,7 @@ phpMyAdmin - ChangeLog
 - bug #3420229 [doc] Missing documentation section
 - bug #3423725 [pdf] Broken PDF file when exporting database to PDF
 
-3.4.6.0 (not yet released)
+3.4.6.0 (2011-10-16)
 - patch #3404173 InnoDB comment display with tooltips/aliases
 - bug #3404886 [navi] Edit SQL statement after error
 - bug #3403165 [interface] Collation not displayed for long enum fields


hooks/post-receive
-- 
phpMyAdmin