]> granicus.if.org Git - php/commitdiff
Merge branch 'master' of https://git.php.net/repository/php-src
authorChristopher Jones <sixd@php.net>
Thu, 17 Oct 2013 12:41:53 +0000 (05:41 -0700)
committerChristopher Jones <sixd@php.net>
Thu, 17 Oct 2013 12:41:53 +0000 (05:41 -0700)
* 'master' of https://git.php.net/repository/php-src:
  Assume the free space is correct on Travis CI.


Trivial merge