Merge branch 'PHP-5.4' into PHP-5.5

Conflicts:
	ext/standard/var_unserializer.c

diff --cc ext/standard/var_unserializer.c
index 3730ff8e81343b7b414f7013b59f0aece042d7e0,d8bae08d2a599925b28cc021da32fe68cc4c7466..ddf43b02cf14d80aedbbb3fcf8e485c1e6f8e615
--- 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 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"
  /*
    +----------------------------------------------------------------------+