Merge branch 'PHP-5.5' into PHP-5.6
authorAnatol Belski <ab@php.net>
Mon, 29 Sep 2014 14:27:33 +0000 (16:27 +0200)
committerAnatol Belski <ab@php.net>
Mon, 29 Sep 2014 14:27:33 +0000 (16:27 +0200)
* PHP-5.5:
  Fixed bug #51800 proc_open on Windows hangs forever

1  2 
main/streams/plain_wrapper.c

Simple merge