Branch: refs/heads/QA_4_5 Home: https://github.com/phpmyadmin/phpmyadmin Commit: ff967d99b82e660c85611781eff10b67faff4972 https://github.com/phpmyadmin/phpmyadmin/commit/ff967d99b82e660c85611781eff1... Author: Madhura Jayaratne madhura.cj@gmail.com Date: 2016-01-15 (Fri, 15 Jan 2016)

Changed paths: M ChangeLog M import.php

Log Message: ----------- Fix #11814 SQL comment and variable stripped from bookmark on save

Signed-off-by: Madhura Jayaratne madhura.cj@gmail.com

Commit: 516082c3c2ce76c6fdc795432d3ae51337b5e2e3 https://github.com/phpmyadmin/phpmyadmin/commit/516082c3c2ce76c6fdc795432d3a... Author: Madhura Jayaratne madhura.cj@gmail.com Date: 2016-01-15 (Fri, 15 Jan 2016)

Changed paths: M po/it.po

Log Message: ----------- Merge branch 'QA_4_5' of github.com:phpmyadmin/phpmyadmin into QA_4_5

Compare: https://github.com/phpmyadmin/phpmyadmin/compare/61c7c3018ad2...516082c3c2ce