From: Christopher Jones <sixd@php.net>
Date: Thu, 17 Oct 2013 12:41:53 +0000 (-0700)
Subject: Merge branch 'master' of https://git.php.net/repository/php-src
X-Git-Tag: php-5.6.0alpha1~211^2~17
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=134caeb8370d68fbea333be3c24be92bf09e430b;p=php

Merge branch 'master' of https://git.php.net/repository/php-src

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

134caeb8370d68fbea333be3c24be92bf09e430b