Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 073712a44214820a2cdc2059acea57d5f404b5a4 https://github.com/phpmyadmin/phpmyadmin/commit/073712a44214820a2cdc2059acea... Author: Madhura Jayaratne <madhura.cj@gmail.com> Date: 2015-02-23 (Mon, 23 Feb 2015) Changed paths: M libraries/config.default.php Log Message: ----------- Use empty string as the default value. Otherwise it gives trouble importing stored settings Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com> Commit: 839c3e943315d628b7a8c458220eddd70d95df05 https://github.com/phpmyadmin/phpmyadmin/commit/839c3e943315d628b7a8c458220e... Author: Madhura Jayaratne <madhura.cj@gmail.com> Date: 2015-02-23 (Mon, 23 Feb 2015) Changed paths: M po/fr.po M po/ia.po Log Message: ----------- Merge branch 'master' of github.com:phpmyadmin/phpmyadmin Compare: https://github.com/phpmyadmin/phpmyadmin/compare/503bbae97a8e...839c3e943315