]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.4' into PHP-5.5
authorPierre Joye <pierre.php@gmail.com>
Mon, 7 Jan 2013 12:04:29 +0000 (13:04 +0100)
committerPierre Joye <pierre.php@gmail.com>
Mon, 7 Jan 2013 12:04:29 +0000 (13:04 +0100)
commitf4142a92b2ecfa0fdf89ec83bb41c2a46b299973
treeea4fd447dfe4af92223c3ecc6e434869f5dbf340
parent8a481c711a1c899971494d88086701ca783c6795
parenta71e91626a3a72d360c285d0c78a16dbac6a0840
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  - fix the fix for bug #50524
ext/standard/proc_open.c