Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Just SKIP that test on travis

Author: m6w6

ext/standard/tests/file/disk_free_space_basic.phpt

@@ -1,5 +1,9 @@
 --TEST--
 Test disk_free_space and its alias diskfreespace() functions : basic functionality
+--SKIPIF--
+<?php
+if (getenv("TRAVIS") === "true") die("skip inaccurate on TravisCI");
+?>
 --INI--
 memory_limit=32M
 --FILE--