Merge branch 'PHP-5.4' into PHP-5.5

Conflicts:
	ext/standard/var_unserializer.c

diff --cc ext/standard/var_unserializer.c
index 857b2d4568e9dde77376a75e4af40ebfe15af13d,bd0b2f66958c80bffe1faee49078e47a23c5c16f..3730ff8e81343b7b414f7013b59f0aece042d7e0
--- 1/ext/standard/var_unserializer.c
--- 2/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"
  /*
    +----------------------------------------------------------------------+