Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Relax tests failing on i386 with new zic

ext/date/tests/getdate_variation7.phpt

@@ -61,7 +61,7 @@ array\(11\) {
   \["mday"\]=>
   int\((9|14|23)\)
   \["wday"\]=>
-  int\(0\)
+  int\((0|6)\)
   \["mon"\]=>
   int\((10|12)\)
   \["year"\]=>
@@ -69,7 +69,7 @@ array\(11\) {
   \["yday"\]=>
   int\((282|347|295)\)
   \["weekday"\]=>
-  string\(6\) "Sunday"
+  string\((6|8)\) "(Sunday|Saturday)"
   \["month"\]=>
   string\((7|8)\) "(October|December)"
   \[0\]=>

ext/date/tests/localtime_variation3.phpt

@@ -87,7 +87,7 @@ array\(9\) {
   \[5\]=>
   int\((104|1|-3843)\)
   \[6\]=>
-  int\(6\)
+  int\((5|6)\)
   \[7\]=>
   int\((281|346|294)\)
   \[8\]=>
@@ -107,7 +107,7 @@ array\(9\) {
   \["tm_year"\]=>
   int\((104|1|-3843)\)
   \["tm_wday"\]=>
-  int\(6\)
+  int\((5|6)\)
   \["tm_yday"\]=>
   int\((281|346|294)\)
   \["tm_isdst"\]=>