Branch: refs/heads/QA_3_5 Home: https://github.com/phpmyadmin/phpmyadmin Commit: b4296d6acbba0c6143e04c2c54922351c3147a98 https://github.com/phpmyadmin/phpmyadmin/commit/b4296d6acbba0c6143e04c2c5492... Author: Michal Čihař mcihar@suse.cz Date: 2012-02-08 (Wed, 08 Feb 2012)

Changed paths: M libraries/config/ConfigFile.class.php M setup/lib/index.lib.php

Log Message: ----------- Escape in correct places to avoid double escaping sometimes

Commit: 40818833afad6c721077c267599ef6b430d0c7a7 https://github.com/phpmyadmin/phpmyadmin/commit/40818833afad6c721077c267599e... Author: Michal Čihař mcihar@suse.cz Date: 2012-02-08 (Wed, 08 Feb 2012)

Changed paths: M libraries/config/ConfigFile.class.php M setup/lib/index.lib.php

Log Message: ----------- Merge remote-tracking branch 'origin/QA_3_4' into QA_3_5

Compare: https://github.com/phpmyadmin/phpmyadmin/compare/e33c665...4081883