From: Joe Watkins <krakjoe@php.net>
Date: Mon, 11 Apr 2016 07:03:39 +0000 (+0100)
Subject: Merge branch 'PHP-7.0'
X-Git-Tag: php-7.1.0alpha1~337
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=2a5385af32118e6cc5d7e26e87835589084dab50;p=php

Merge branch 'PHP-7.0'

* PHP-7.0:
  fix calendar segfault
---

2a5385af32118e6cc5d7e26e87835589084dab50