]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.5' of https://git.php.net/repository/php-src into PHP-5.5
authorChristopher Jones <sixd@php.net>
Thu, 17 Oct 2013 12:40:57 +0000 (05:40 -0700)
committerChristopher Jones <sixd@php.net>
Thu, 17 Oct 2013 12:40:57 +0000 (05:40 -0700)
commit4628c9b3752fd001d0d25e53fd77d322ae8d5152
tree825586b5a3195a273bc9e20c7658f32a8ed8e8e8
parent06994a419d625291c2ae071e3b22716901b45cf6
parent51b809e3ad244df1102ca2f44a03ea1fee063579
Merge branch 'PHP-5.5' of https://git.php.net/repository/php-src into PHP-5.5

* 'PHP-5.5' of https://git.php.net/repository/php-src:
  Assume the free space is correct on Travis CI.