From: Anatol Belski <ab@php.net>
Date: Tue, 5 Apr 2016 09:24:45 +0000 (+0200)
Subject: Merge branch 'PHP-7.0'
X-Git-Tag: php-7.1.0alpha1~378
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=9f5970e60ae31f1cec8756db2c29782c85de4f7a;p=php

Merge branch 'PHP-7.0'

* PHP-7.0:
  Use STR_EMPTY_ALLOC macro instead
  Fix DateInterval::format segfault
---

9f5970e60ae31f1cec8756db2c29782c85de4f7a