From: Julien Pauli <jpauli@php.net>
Date: Wed, 10 Dec 2014 10:22:46 +0000 (+0100)
Subject: Merge branch 'PHP-5.5' into PHP-5.6
X-Git-Tag: PRE_NATIVE_TLS_MERGE~17^2~6
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=9a1fc445bf11a200508f501b0250fc4f180078fb;p=php

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Updated NEWS
---

9a1fc445bf11a200508f501b0250fc4f180078fb