Merge branch 'PHP-5.4' into PHP-5.5

Conflicts:
	ext/date/lib/parse_date.c

diff --cc ext/date/lib/parse_date.c
index e8dec50292a5d85bc92ea8d01969899cc79ca297,47b48178c2dc5fe1e1a712b1a13acd08acdd2789..bb4c700d3951e8ec144924bba10b65f5e8db87fb
--- 1/ext/date/lib/parse_date.c
--- 2/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"
  /*
     +----------------------------------------------------------------------+

diff --cc ext/date/lib/parse_date.re
Simple merge