Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 12fa1e648113ed689700bb0a979d4a5b8e618b89 https://github.com/phpmyadmin/phpmyadmin/commit/12fa1e648113ed689700bb0a979d... Author: Marc Delisle marc@infomarc.info Date: 2015-08-10 (Mon, 10 Aug 2015)

Changed paths: M ChangeLog M libraries/Util.class.php

Log Message: ----------- Incorrect scalar type declaration (reported under PHP 7)

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

Commit: 429a20d0dce6a98527d7292bdc4f0b33023c7975 https://github.com/phpmyadmin/phpmyadmin/commit/429a20d0dce6a98527d7292bdc4f... Author: Marc Delisle marc@infomarc.info Date: 2015-08-10 (Mon, 10 Aug 2015)

Changed paths: M ChangeLog

Log Message: ----------- Merge branch 'QA_4_4'

Compare: https://github.com/phpmyadmin/phpmyadmin/compare/b230ab9bb82f...429a20d0dce6