From: Felipe Pena <felipensp@gmail.com>
Date: Sat, 15 Feb 2014 13:05:25 +0000 (-0200)
Subject: Merge branch 'PHP-5.5' into PHP-5.6
X-Git-Tag: php-5.6.0alpha3~1^2~89
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=8cec20a5656935f6fecd66058513657487b2e7cf;p=php

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  - Fix ZTS build when HAVE_PQESCAPELITERAL is not set
  Update NEWS
  Update NEWS
---

8cec20a5656935f6fecd66058513657487b2e7cf