Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  5.4.27 now
  update NEWS

Conflicts:
	configure.in
	main/php_version.h
This commit is contained in:
Stanislav Malyshev 2014-02-17 21:22:03 -08:00
commit 58b7f21c3f

Diff Content Not Available