Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  update news

Conflicts:
	ext/standard/crypt.c
This commit is contained in:
Stanislav Malyshev 2014-11-30 21:38:30 -08:00
commit f7eedbe9a6

Diff Content Not Available