[Phpmyadmin-git] [phpmyadmin/phpmyadmin] 8260ae: Bug #4640 Incorrect reference to PHP 6

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 8260ae8b7507415e3dcac9d5ec2704150c79d8cb https://github.com/phpmyadmin/phpmyadmin/commit/8260ae8b7507415e3dcac9d5ec2… Author: Marc Delisle <marc(a)infomarc.info> Date: 2014-12-10 (Wed, 10 Dec 2014) Changed paths: M ChangeLog M doc/setup.rst Log Message: ----------- Bug #4640 Incorrect reference to PHP 6 Signed-off-by: Marc Delisle <marc(a)infomarc.info> Commit: d5e485f4f1d600c6e776503691fd472b1f85d648 https://github.com/phpmyadmin/phpmyadmin/commit/d5e485f4f1d600c6e776503691f… Author: Marc Delisle <marc(a)infomarc.info> Date: 2014-12-10 (Wed, 10 Dec 2014) Changed paths: M ChangeLog M doc/setup.rst Log Message: ----------- Merge branch 'QA_4_3' Compare: https://github.com/phpmyadmin/phpmyadmin/compare/60b87410fdcd...d5e485f4f1d6