From: Derick Rethans <github@derickrethans.nl>
Date: Mon, 11 Jul 2016 10:32:10 +0000 (+0100)
Subject: Merge branch 'PHP-5.6' into PHP-7.0
X-Git-Tag: php-7.1.0beta1~126^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=7759d6b0db0437195442ea2d43e1a49001ef23a7;p=php

Merge branch 'PHP-5.6' into PHP-7.0
---

7759d6b0db0437195442ea2d43e1a49001ef23a7
diff --cc ext/date/lib/parse_date.c
index 059b04cfcd,b5bc04e83e..be2411e055
--- a/ext/date/lib/parse_date.c
+++ b/ext/date/lib/parse_date.c
@@@ -1,4 -1,4 +1,4 @@@
- /* Generated by re2c 0.13.5 on Thu Aug 13 10:30:11 2015 */
 -/* Generated by re2c 0.16 on Mon Jul 11 11:31:07 2016 */
++/* Generated by re2c 0.16 on Mon Jul 11 11:31:57 2016 */
  #line 1 "ext/date/lib/parse_date.re"
  /*
   * The MIT License (MIT)