From: Felipe Pena <felipensp@gmail.com>
Date: Sat, 15 Feb 2014 13:05:08 +0000 (-0200)
Subject: Merge branch 'PHP-5.4' into PHP-5.5
X-Git-Tag: php-5.5.10RC1~13
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a65a54664066b69663d51726c64d3ff0e940f5c4;p=php

Merge branch 'PHP-5.4' into PHP-5.5

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

a65a54664066b69663d51726c64d3ff0e940f5c4