From: Xinchen Hui <laruence@php.net>
Date: Mon, 21 Jan 2013 03:42:16 +0000 (+0800)
Subject: Merge branch 'PHP-5.4' into PHP-5.5
X-Git-Tag: php-5.5.0alpha4~3^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=85fae636d09a08b53ffd7244cc6e8ec4d4cdab7c;p=php

Merge branch 'PHP-5.4' into PHP-5.5

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

85fae636d09a08b53ffd7244cc6e8ec4d4cdab7c
diff --cc ext/standard/var_unserializer.c
index 857b2d4568,bd0b2f6695..3730ff8e81
--- a/ext/standard/var_unserializer.c
+++ b/ext/standard/var_unserializer.c
@@@ -1,4 -1,4 +1,4 @@@
- /* Generated by re2c 0.13.5 */
 -/* Generated by re2c 0.13.5 on Mon Jan 21 11:34:03 2013 */
++/* Generated by re2c 0.13.5 on Mon Jan 21 11:41:53 2013 */
  #line 1 "ext/standard/var_unserializer.re"
  /*
    +----------------------------------------------------------------------+