From: Xinchen Hui <laruence@php.net>
Date: Sat, 9 Mar 2013 15:10:48 +0000 (+0800)
Subject: Merge branch 'PHP-5.4' into PHP-5.5
X-Git-Tag: php-5.5.0beta1~52^2~3
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=1be745ce1bad3875aa2b1fc7abeefda22f372f19;p=php

Merge branch 'PHP-5.4' into PHP-5.5

Conflicts:
	ext/standard/var_unserializer.c
---

1be745ce1bad3875aa2b1fc7abeefda22f372f19
diff --cc ext/standard/var_unserializer.c
index 3730ff8e81,d8bae08d2a..ddf43b02cf
--- a/ext/standard/var_unserializer.c
+++ b/ext/standard/var_unserializer.c
@@@ -1,4 -1,4 +1,4 @@@
- /* Generated by re2c 0.13.5 on Mon Jan 21 11:41:53 2013 */
 -/* Generated by re2c 0.13.5 on Sat Mar  9 22:33:09 2013 */
++/* Generated by re2c 0.13.5 */
  #line 1 "ext/standard/var_unserializer.re"
  /*
    +----------------------------------------------------------------------+