From: Ferenc Kovacs <tyrael@php.net>
Date: Thu, 4 Dec 2014 10:12:17 +0000 (+0100)
Subject: Merge branch 'pull-request/932' into PHP-5.5
X-Git-Tag: PRE_NATIVE_TLS_MERGE~67^2^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=4f9f7c7948d8c852a5038a4a8787cc8b6f465940;p=php

Merge branch 'pull-request/932' into PHP-5.5

* pull-request/932:
  add initial install
  switch to C travis project instead of PHP
  use the generic TRAVIS environment var to check for travis (see http://docs.travis-ci.com/user/ci-environment/)
---

4f9f7c7948d8c852a5038a4a8787cc8b6f465940