Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 18e6cfd5c5109736ea077d1f47e6b8a72e9dc074 https://github.com/phpmyadmin/phpmyadmin/commit/18e6cfd5c5109736ea077d1f47e6... Author: Marc Delisle <marc@infomarc.info> Date: 2014-06-26 (Thu, 26 Jun 2014) Changed paths: M ChangeLog M doc/config.rst M doc/require.rst M index.php M libraries/config.default.php M libraries/config/messages.inc.php M libraries/config/setup.forms.php M libraries/config/user_preferences.forms.php Log Message: ----------- mcrypt: remove the requirement (64-bit) and the related warning Signed-off-by: Marc Delisle <marc@infomarc.info> Commit: 8ce1e316a6a5f0692c11166cbeab1dd0a812c7d9 https://github.com/phpmyadmin/phpmyadmin/commit/8ce1e316a6a5f0692c11166cbeab... Author: Marc Delisle <marc@infomarc.info> Date: 2014-06-26 (Thu, 26 Jun 2014) Changed paths: M ChangeLog M doc/config.rst M doc/require.rst M index.php M libraries/config.default.php M libraries/config/messages.inc.php M libraries/config/setup.forms.php M libraries/config/user_preferences.forms.php Log Message: ----------- Merge branch 'QA_4_2' Compare: https://github.com/phpmyadmin/phpmyadmin/compare/210292e46363...8ce1e316a6a5