Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 8fe17dda905336b5e4492e12684664f48b2709d4 https://github.com/phpmyadmin/phpmyadmin/commit/8fe17dda905336b5e4492e126846... Author: Marc Delisle marc@infomarc.info Date: 2015-10-04 (Sun, 04 Oct 2015)

Changed paths: M doc/config.rst

Log Message: ----------- Clarify possible values

Signed-off-by: Marc Delisle marc@infomarc.info

Commit: 80ccd03bab05ffd45e078250c39cd8d4a435b41d https://github.com/phpmyadmin/phpmyadmin/commit/80ccd03bab05ffd45e078250c39c... Author: Marc Delisle marc@infomarc.info Date: 2015-10-04 (Sun, 04 Oct 2015)

Changed paths: M doc/config.rst

Log Message: ----------- Merge branch 'QA_4_5'

Compare: https://github.com/phpmyadmin/phpmyadmin/compare/0e7e952b7baa...80ccd03bab05