]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.3' into PHP-5.4
authorPierre Joye <pierre.php@gmail.com>
Mon, 7 Jan 2013 12:04:04 +0000 (13:04 +0100)
committerPierre Joye <pierre.php@gmail.com>
Mon, 7 Jan 2013 12:04:04 +0000 (13:04 +0100)
* PHP-5.3:
  - fix the fix for bug #50524

1  2 
ext/standard/proc_open.c

Simple merge