]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.1' of git.php.net:/php-src into PHP-7.1
authorJoe Watkins <krakjoe@php.net>
Mon, 2 Jan 2017 09:41:44 +0000 (09:41 +0000)
committerJoe Watkins <krakjoe@php.net>
Mon, 2 Jan 2017 09:41:44 +0000 (09:41 +0000)
* 'PHP-7.1' of git.php.net:/php-src:
  Flush stderr on win32 in cli_log_message
  Fixed bug #73154


Trivial merge