]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.4'
authorNikita Popov <nikic@php.net>
Sun, 1 Jul 2012 15:06:51 +0000 (17:06 +0200)
committerNikita Popov <nikic@php.net>
Sun, 1 Jul 2012 15:06:51 +0000 (17:06 +0200)
commit4ff60737f76d0d10277e22db5e713ee4bbebef2d
treee55d790595ea303a452fdf871d99aeb5ad2767e2
parentf6f9e3d1660eac9091d647b18e66c612cec71c6f
parentff41bfc87882440cfde0ed5673bd6c3f2347c892
Merge branch 'PHP-5.4'

* PHP-5.4:
  Fix accidential change of php_version.h