From: Joe Watkins <krakjoe@php.net>
Date: Sat, 12 Nov 2016 09:59:24 +0000 (+0000)
Subject: Merge branch 'PHP-7.0' into PHP-7.1
X-Git-Tag: php-7.2.0alpha1~952^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d1910f66e5b15e52934d7fdc68c6a4c217c34f9d;p=php

Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  added a test for date_interval_format function
  Merge branch 'pull-request/2198'
---

d1910f66e5b15e52934d7fdc68c6a4c217c34f9d