Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 3a1c5d5b68a3d96d84738aa3264fe19ed3722885 https://github.com/phpmyadmin/phpmyadmin/commit/3a1c5d5b68a3d96d84738aa3264f... Author: Marc Delisle marc@infomarc.info Date: 2014-01-24 (Fri, 24 Jan 2014)

Changed paths: M ChangeLog M libraries/vendor_config.php

Log Message: ----------- bug #4247 open_basedir warnings on export page

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

Commit: 3e4766d3ce9515ff2a835cae0d68ff3969ba252a https://github.com/phpmyadmin/phpmyadmin/commit/3e4766d3ce9515ff2a835cae0d68... Author: Marc Delisle marc@infomarc.info Date: 2014-01-24 (Fri, 24 Jan 2014)

Changed paths: M ChangeLog M libraries/vendor_config.php

Log Message: ----------- Merge branch 'QA_4_1'

Compare: https://github.com/phpmyadmin/phpmyadmin/compare/36e7d2d6a1ef...3e4766d3ce95