]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.4' into PHP-5.5
authorPierre Joye <pierre.php@gmail.com>
Sun, 24 Mar 2013 12:29:16 +0000 (13:29 +0100)
committerPierre Joye <pierre.php@gmail.com>
Sun, 24 Mar 2013 12:29:16 +0000 (13:29 +0100)
* PHP-5.4:
  - add reminder for checking return values

1  2 
sapi/cli/php_cli_server.c

Simple merge