]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.6'
authorAnatol Belski <ab@php.net>
Mon, 29 Sep 2014 14:30:40 +0000 (16:30 +0200)
committerAnatol Belski <ab@php.net>
Mon, 29 Sep 2014 14:30:40 +0000 (16:30 +0200)
commit78e23758b7efa10d7f7957534c101e344c880545
treec77045a037b8f436321770b788770a0eb789ae26
parentf248b17e07d6746ed1057611cae5f2d11918fb4e
parent7e16bb263f959ddbb5ea9eac8326db9101dd5d5e
Merge branch 'PHP-5.6'

* PHP-5.6:
  updated NEWS
  Fixed bug #51800 proc_open on Windows hangs forever

Conflicts:
main/streams/plain_wrapper.c
main/streams/plain_wrapper.c