]> granicus.if.org Git - php/commit
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)
commita71e91626a3a72d360c285d0c78a16dbac6a0840
tree8d7aa58689e5484fb1cf5256b529f456fb63aec3
parent954e7a3b3ca115b619b1b326ae4ae31a7cf196db
parentc0fae054c92cf73e5f7a7c32d624e43afabfd8e0
Merge branch 'PHP-5.3' into PHP-5.4

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