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

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

* origin/master:
  updated lib versions
  updated lib versions
---

67f1d2ae264722ecbd73a337c29748188f7d0565