From: Andrea Faulds <ajf@ajf.me>
Date: Sat, 20 Sep 2014 23:29:48 +0000 (+0100)
Subject: Merge branch 'master' into integer_semantics
X-Git-Tag: PRE_NATIVE_TLS_MERGE~158^2~82
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=12b15e5ca4ae7ebf6e50551a4c666ece97068074;p=php

Merge branch 'master' into integer_semantics
---

12b15e5ca4ae7ebf6e50551a4c666ece97068074