]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.5'
authorMichael Wallner <mike@php.net>
Thu, 17 Oct 2013 10:12:26 +0000 (12:12 +0200)
committerMichael Wallner <mike@php.net>
Thu, 17 Oct 2013 10:12:26 +0000 (12:12 +0200)
commitbd666e2f99acfb1ec53efd300538a8477dedfe1c
treeadf840921517381b212154b54146ba8d9015e416
parent89e93bd2a27d66c9d56218e31cd42441298548e6
parent51b809e3ad244df1102ca2f44a03ea1fee063579
Merge branch 'PHP-5.5'

* PHP-5.5:
  Assume the free space is correct on Travis CI.
ext/standard/tests/file/disk_free_space_basic.phpt