]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.4' into PHP-5.5
authorFerenc Kovacs <tyrael@php.net>
Wed, 26 Feb 2014 14:10:23 +0000 (15:10 +0100)
committerFerenc Kovacs <tyrael@php.net>
Wed, 26 Feb 2014 14:10:23 +0000 (15:10 +0100)
commitd18089d62181b000d67b66e928cc796d8dd277e7
treeabda828c1e1f84f465353f3b01e9ce31556ee480
parente1b1ef0d793dabcf4ca7ab4e62fae18f0b73b013
parent4d9c556b5d4f0a04a42d1cc4dc0ac6cadd2e198a
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  add news entry
  add clear_env option to FPM config