Merge branch 'PHP-5.5'

* PHP-5.5:
  bump version
  Update NEWS

Conflicts:
	configure.in
	main/php_version.h
This commit is contained in:
Stanislav Malyshev 2013-08-20 00:03:29 -07:00
commit a52b8fe117

Diff Content Not Available