]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.5' into PHP-5.6
authorAnatol Belski <ab@php.net>
Thu, 21 May 2015 06:21:53 +0000 (08:21 +0200)
committerAnatol Belski <ab@php.net>
Thu, 21 May 2015 06:21:53 +0000 (08:21 +0200)
commitad4d022bdf23b087b0d2c84e4941706755467d89
tree0535f2a4d5f9b800e5e849c645a5f65753364361
parent59a78d48f06de10d927987dd0c940bf3c03dd316
parent75286ece1a57f17c568b3d531eebc94ec5046a47
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  fix handling VAR vs VAR= in putenv
ext/standard/basic_functions.c