Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 36ba14ad8ef27ea0098211465bf6ee56f8a81cf0 https://github.com/phpmyadmin/phpmyadmin/commit/36ba14ad8ef27ea0098211465bf6... Author: Marc Delisle marc@infomarc.info Date: 2015-08-03 (Mon, 03 Aug 2015)

Changed paths: M libraries/Scripts.class.php M libraries/SystemDatabase.class.php M libraries/plugins/export/PMA_ExportPdf.class.php

Log Message: ----------- Make scrutinizer happy

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

Commit: f7626c6d277a30078bb223f9304e44c657b2e882 https://github.com/phpmyadmin/phpmyadmin/commit/f7626c6d277a30078bb223f9304e... Author: Marc Delisle marc@infomarc.info Date: 2015-08-03 (Mon, 03 Aug 2015)

Changed paths: M po/it.po M po/sl.po

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

Compare: https://github.com/phpmyadmin/phpmyadmin/compare/e48f2127fb97...f7626c6d277a