From: Anatol Belski <ab@php.net>
Date: Wed, 26 Nov 2014 16:20:53 +0000 (+0100)
Subject: Merge remote-tracking branch 'origin/master' into native-tls
X-Git-Tag: POST_NATIVE_TLS_MERGE^2~40
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=81a24f054b934ccb1be77049dd9c244283efcba7;p=php

Merge remote-tracking branch 'origin/master' into native-tls

* origin/master:
  PHP-5.6.5 is next
---

81a24f054b934ccb1be77049dd9c244283efcba7