]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.4' into PHP-5.5
authorStanislav Malyshev <stas@php.net>
Mon, 14 Apr 2014 00:03:28 +0000 (17:03 -0700)
committerStanislav Malyshev <stas@php.net>
Mon, 14 Apr 2014 00:03:28 +0000 (17:03 -0700)
* PHP-5.4:
  Fix windows build


Trivial merge