From: Anatol Belski <ab@php.net>
Date: Wed, 23 Dec 2015 17:38:54 +0000 (+0100)
Subject: Merge branch 'PHP-5.6' into PHP-7.0
X-Git-Tag: php-7.0.3RC1~108^2~1
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=46db3a73204ba68cd5b22d10bc3e9bb65290ac8e;p=php

Merge branch 'PHP-5.6' into PHP-7.0

* PHP-5.6:
  update NEWS
  Added test for bug #71201
  Bug #71201 round() segfault on 64-bit builds

Conflicts:
	ext/standard/math.c
---

46db3a73204ba68cd5b22d10bc3e9bb65290ac8e