Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: dd39ca8da0a4de4e8fbbf457651c24f7e6f69066 https://github.com/phpmyadmin/phpmyadmin/commit/dd39ca8da0a4de4e8fbbf457651c... Author: Marc Delisle <marc@infomarc.info> Date: 2013-08-24 (Sat, 24 Aug 2013) Changed paths: M doc/require.rst Log Message: ----------- The ctype extension is not required but only suggested for performance Commit: eae2f1bc28ed9750210cc08675289789bbb2c879 https://github.com/phpmyadmin/phpmyadmin/commit/eae2f1bc28ed9750210cc0867528... Author: Marc Delisle <marc@infomarc.info> Date: 2013-08-24 (Sat, 24 Aug 2013) Changed paths: M doc/require.rst Log Message: ----------- Fix merge conflicts Commit: 94a309b077fd67631daeaf55414ddbc4a5473fa8 https://github.com/phpmyadmin/phpmyadmin/commit/94a309b077fd67631daeaf55414d... Author: Marc Delisle <marc@infomarc.info> Date: 2013-08-24 (Sat, 24 Aug 2013) Changed paths: M doc/require.rst Log Message: ----------- We are already talking about PHP, no need to mention it Compare: https://github.com/phpmyadmin/phpmyadmin/compare/220fa37a6f1a...94a309b077fd