[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_1RC1-1981-g13f09c0

[Michal Čihař]

The branch, master has been updated
       via  13f09c03cfa37ba3f05fde015826ce4893158293 (commit)
       via  e3a73f0e7a16611552058b235ab1e1452e731b08 (commit)
       via  29940ea6b077935c48d2e946c3c41d1063443782 (commit)
       via  24a77645339b9cb32c524456a10dcd0272fdb926 (commit)
       via  c76187732bea3c95c6beab20229c9584803396f4 (commit)
      from  4e2cd5e998340f2f7262bc890d64e51c85970937 (commit)


- Log -----------------------------------------------------------------
commit 13f09c03cfa37ba3f05fde015826ce4893158293
Merge: 4e2cd5e998340f2f7262bc890d64e51c85970937 e3a73f0e7a16611552058b235ab1e1452e731b08
Author: Michal Čihař <michal at cihar.com>
Date:   Wed May 25 06:55:58 2011 +0200

    Merge branch 'QA_3_4'

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

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

diff --git a/.gitignore b/.gitignore
index a773f8e..b492910 100644
--- a/.gitignore
+++ b/.gitignore
@@ -29,3 +29,5 @@ locale
 sources
 # API documentation
 apidoc
+# Demo server
+revision-info.php


hooks/post-receive
-- 
phpMyAdmin