From: Anatol Belski <ab@php.net>
Date: Thu, 18 Feb 2016 18:14:37 +0000 (+0100)
Subject: Merge branch 'PHP-7.0'
X-Git-Tag: php-7.1.0alpha1~605
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=2a1dffbaf0259fb0accd64a387bf11cc008f201f;p=php

Merge branch 'PHP-7.0'

* PHP-7.0:
  Bug #71596 Segmentation fault on ZTS with date function (setlocale)
---

2a1dffbaf0259fb0accd64a387bf11cc008f201f