Nikita Popov 9f5ec5a69a Merge branch '3.x'
Conflicts:
	lib/PhpParser/Parser/Php5.php
	lib/PhpParser/Parser/Php7.php
	test/code/parser/stmt/class/name.test
2017-02-09 20:38:33 +01:00
..
2017-02-09 20:38:33 +01:00
2017-02-09 20:38:33 +01:00
2017-01-19 22:31:29 +01:00
2017-02-09 20:38:33 +01:00
2017-01-19 22:25:22 +01:00