From: Derick Rethans <github@derickrethans.nl>
Date: Sat, 25 Jan 2014 15:16:23 +0000 (+0100)
Subject: Merge branch 'PHP-5.4' into PHP-5.5
X-Git-Tag: php-5.5.10RC1~51
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=93ede745bce93c27432a6330078980e7ed3dad70;p=php

Merge branch 'PHP-5.4' into PHP-5.5

Conflicts:
	ext/date/lib/parse_date.c
---

93ede745bce93c27432a6330078980e7ed3dad70
diff --cc ext/date/lib/parse_date.c
index e8dec50292,47b48178c2..bb4c700d39
--- 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 Sun Aug 25 15:12:48 2013 */
 -/* Generated by re2c 0.13.5 on Sat Jan 25 15:48:30 2014 */
++/* Generated by re2c 0.13.5 on Sat Jan 25 16:16:11 2014 */
  #line 1 "ext/date/lib/parse_date.re"
  /*
     +----------------------------------------------------------------------+