[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0BETA1-1449-g153219a

[Michal Čihař]

The branch, master has been updated
       via  153219a082d54da3be838226cb22425715bd1521 (commit)
       via  6135612dbb1150c6a0a6287246c8103ee637de93 (commit)
       via  6b91d2ef54d15ee56662859abaf0b4795f7293c7 (commit)
       via  9ebd401b0ea4efea8ddc8cd846da559bf420ccaa (commit)
       via  8928900532d111e849362b6359571a3b079eb9ea (commit)
       via  066b746befdacf10d87f2eaf3de8ee68f745a447 (commit)
      from  87703ef690aa0f885638fb3c995643dd04c949fe (commit)


- Log -----------------------------------------------------------------
commit 153219a082d54da3be838226cb22425715bd1521
Merge: 87703ef690aa0f885638fb3c995643dd04c949fe 6135612dbb1150c6a0a6287246c8103ee637de93
Author: Michal Čihař <mcihar at novell.com>
Date:   Thu Jan 6 09:56:32 2011 +0100

    Merge branch 'QA_3_3'
    
    Conflicts:
    	libraries/core.lib.php

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

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

diff --git a/themes/.gitignore b/themes/.gitignore
index 410d2dc..5bae234 100644
--- a/themes/.gitignore
+++ b/themes/.gitignore
@@ -16,6 +16,7 @@ original_small
 paradice
 pixeline
 pmahomme
+programmersdarkside
 silk
 silkline
 smooth_yellow


hooks/post-receive
-- 
phpMyAdmin