]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.5'
authorMichael Wallner <mike@php.net>
Mon, 21 Oct 2013 10:21:21 +0000 (12:21 +0200)
committerMichael Wallner <mike@php.net>
Mon, 21 Oct 2013 10:21:21 +0000 (12:21 +0200)
commit6764993358f2da19896f1c0ca6a114af744125dc
tree73c9a47ded8ed0d8da4b27033530ca9925978159
parent454a9fcb14c62384bd223c1d5668701061cf647f
parentfb610b4e808c770800434d1a42d606f274927a94
Merge branch 'PHP-5.5'

* PHP-5.5:
  remove TRAVIS check in test source
  Just SKIP that test on travis
ext/standard/tests/file/disk_free_space_basic.phpt