Nikita Popov 865bfb2acf Merge branch '3.x'
Conflicts:
	grammar/php7.y
	lib/PhpParser/Parser/Php7.php
	test/code/parser/expr/uvs/globalNonSimpleVarError.test
	test/code/parser/stmt/namespace/groupUseErrors.test
2017-02-05 17:50:54 +01:00
..
2017-02-05 17:50:54 +01:00
2017-02-05 17:50:54 +01:00
2017-01-19 22:31:29 +01:00
2017-02-05 17:50:54 +01:00
2017-01-19 22:25:22 +01:00