Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 170238ecb2f5ab1c5aab56520d53193c2813eede https://github.com/phpmyadmin/phpmyadmin/commit/170238ecb2f5ab1c5aab56520d53... Author: Marc Delisle marc@infomarc.info Date: 2013-02-01 (Fri, 01 Feb 2013)

Changed paths: M libraries/schema/User_Schema.class.php

Log Message: ----------- Escape table name in relational schema editing

Commit: 5f25a09748cd6e4d944157d1b6f2738ffe27fcb3 https://github.com/phpmyadmin/phpmyadmin/commit/5f25a09748cd6e4d944157d1b6f2... Author: Marc Delisle marc@infomarc.info Date: 2013-02-01 (Fri, 01 Feb 2013)

Log Message: ----------- Merge branch 'QA_3_5'

Commit: 84e8341abbd676188fa26e53a4eb597fb1a2be90 https://github.com/phpmyadmin/phpmyadmin/commit/84e8341abbd676188fa26e53a4eb... Author: Marc Delisle marc@infomarc.info Date: 2013-02-01 (Fri, 01 Feb 2013)

Changed paths: M libraries/schema/User_Schema.class.php

Log Message: ----------- Fix merge conflicts

Compare: https://github.com/phpmyadmin/phpmyadmin/compare/d89da8f1d849...84e8341abbd6