]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.5' into PHP-5.6
authorAnatol Belski <ab@php.net>
Mon, 14 Apr 2014 21:34:50 +0000 (23:34 +0200)
committerAnatol Belski <ab@php.net>
Mon, 14 Apr 2014 21:34:50 +0000 (23:34 +0200)
* PHP-5.5:
  fix windows build


Trivial merge