]> granicus.if.org Git - php/commitdiff
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)
* PHP-5.4:
  Fix accidential change of php_version.h


Trivial merge