From: Anatol Belski <ab@php.net>
Date: Sat, 25 Oct 2014 00:17:41 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/master' into native-tls
X-Git-Tag: POST_NATIVE_TLS_MERGE^2~47
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=4262663e4caa82ba17666781a95bdcb872b4e109;p=php

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

* origin/master:
  refix the broken place
---

4262663e4caa82ba17666781a95bdcb872b4e109