[Phpmyadmin-git] [SCM] phpMyAdmin branch, QA_3_3, updated. RELEASE_3_3_0RC1-67-gd659f3b

[Michal Čihař]

The branch, QA_3_3 has been updated
       via  d659f3ba2b6dafbd818caca1f22a45455690198c (commit)
       via  47ec6a7b7eb899533213136ea7f22cb690dc137c (commit)
       via  995b90b5514557cb9ed6042844216fcecfe48a24 (commit)
       via  09896700e4c90916997da5d5d0579ea92a1f6d5a (commit)
       via  7443d8286dfe655dfd38ed20cf26099ae65d2ab2 (commit)
       via  05477fff976073aa2074e905bdfa249779e1fcca (commit)
       via  861dd5c0c2fed019954ab2129db2d27adfe958a9 (commit)
       via  0d16251c6b9ad831daed75df4db73d8e7e5a3b64 (commit)
       via  bc908c732a577b054a3046b2386afe77edd8a8cd (commit)
       via  0fa6c3d985160ccb857ffe311267a7df22435f75 (commit)
       via  9bcc37451d42dce0f522bf0d51462bb82abc14d8 (commit)
       via  f4d129ac03ff7011d6e54d60243c88aebf790e52 (commit)
       via  d24640d62ef13e733f22445a7d3fb5e4cc32a9ca (commit)
       via  bf857315b9ca14ebb9dad2d3f1d195fe1a14d331 (commit)
       via  b9daf34b79b0271e62e4de3bc7b6bf9008e719c5 (commit)
       via  f900210a0f05511658a8d64d8876b935ab7a5972 (commit)
       via  66c830e2a5deaa4196fe82e1df45f1f89bbc5a60 (commit)
       via  548d96d611b100ef1bf10165eaacb8cd2c5d75f9 (commit)
       via  cbe8f389821d2fb0a107478e73b654309566380d (commit)
       via  326deca827d87eb148afb96fa6ec7ce29644cb93 (commit)
       via  a239f9bb3ebe0994a76d5d946418bdce4a9298e4 (commit)
       via  5fd02248cd4f410d963daf55150c33e8d4e01850 (commit)
       via  fd739840cdb07739c8b971363291c9d0534764ec (commit)
       via  624dde89ef6ac51adea3f1be045128bcbcd7eeb8 (commit)
       via  644b56f65594244fc0f8ec5f25398ab9b3678e7c (commit)
       via  e5a58432b523ea22d1ec1332e55a758bd7adced2 (commit)
       via  0a6badd2d60b6cc216f714ea777905566de14e60 (commit)
       via  f1b8b850eb559ae202fb7220c5cf3d7703df5e60 (commit)
       via  aecbb213aaf4f779f8feaa4ad4cc3fa9d59ce673 (commit)
       via  c67fd7f732e56d668399a4d44bcdf5f2a803a7c3 (commit)
       via  fe5e8999b42b98873a032a937cb873f2d47a1826 (commit)
       via  182ca44769a3940616e42de5b90ad97693dec362 (commit)
       via  8adc82666bca869bdf73f2b92d40df532fe10f57 (commit)
       via  e16be872b64cab229784a0700a329871454f8baf (commit)
       via  4beb8bdff67ad57e27ed1d1ae02451fc356a5df7 (commit)
       via  079cb404c776821bc9b161bd297b956a6e6418a4 (commit)
       via  6b56175cd1b8e9bbaca5ab56266039b8129b34af (commit)
       via  cd6b2795d3168aba7c8c0ff7069b99d86e98c6a7 (commit)
       via  867782d82ffe888feb40091aa417818e115090b8 (commit)
       via  994381d3c827271b61ccd203f5c953b434a6b772 (commit)
       via  b10d8c63abb010c9917f3a20b192b22da62bf478 (commit)
       via  db93a7fb0dfc674934d72e3174d024c99b7a0ff1 (commit)
       via  34fbba8ef5a04ad182687bb9a0a5349243cd9790 (commit)
       via  f92e4dfad9c33f1c822d375b638ad65fcdd815d1 (commit)
       via  1f56635db547a7440b6463fc4d9d8d5bb1ed65ec (commit)
       via  78ee46662ac7e0371109fef2ad5a782a1aa7cc72 (commit)
       via  c3259a276c5a455c6e0907cd42edd94f644df7d6 (commit)
       via  93bebe47bc8c3b68e2b9df1c3cb6885503aee17b (commit)
       via  a2fa8219c85f49b1aeadc5edf37ad4afb89ae6cf (commit)
      from  3f5d1063ff6af5aa036be26a4d5fac9806eccfac (commit)


- Log -----------------------------------------------------------------
commit d659f3ba2b6dafbd818caca1f22a45455690198c
Merge: 47ec6a7b7eb899533213136ea7f22cb690dc137c 995b90b5514557cb9ed6042844216fcecfe48a24
Author: Michal Čihař <mcihar at novell.com>
Date:   Thu Mar 11 13:56:27 2010 +0100

    Merge remote branch 'origin/MAINT_3_3_1' into QA_3_3
    
    Conflicts:
    	Documentation.html
    	README
    	libraries/Config.class.php
    	translators.html

commit 47ec6a7b7eb899533213136ea7f22cb690dc137c
Merge: 3f5d1063ff6af5aa036be26a4d5fac9806eccfac 09896700e4c90916997da5d5d0579ea92a1f6d5a
Author: Michal Čihař <mcihar at novell.com>
Date:   Thu Mar 11 13:55:07 2010 +0100

    Merge remote branch 'origin/MAINT_3_3_0' into QA_3_3
    
    Conflicts:
    	ChangeLog
    	Documentation.html
    	README
    	libraries/Config.class.php
    	libraries/display_import.lib.php
    	translators.html

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

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

diff --git a/ChangeLog b/ChangeLog
index f120b5a..58e3122 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -97,7 +97,11 @@ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyA
 - bug #869006 [structure] Ignore number of records for MRG_MyISAM tables
 - bug [browse] "Show BLOB contents" should display HTML code that is present
   in a BLOB, thanks to Vincent van der Tuin
+<<<<<<< HEAD
 - [privileges] Improve escaping of hostname
+=======
+- [privileges] Improve Proper escaping of hostname
+>>>>>>> origin/MAINT_3_3_0
 
 3.2.4.0 (2009-12-02)
 - bug [engines] Innodb_buffer_pool_pages_latched no longer returned in status


hooks/post-receive
-- 
phpMyAdmin