]> granicus.if.org Git - php/commit
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)
commit634e6b61d9495226ee48bf12ae5be2e57fb254d6
treedf1b270248734c790387fab0b4823fd267f581c5
parent6adc84a701797c22888d33478b7591337c476c01
parent793f67e85213f789ace0c766c13815a6025a2059
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  fix windows build