From: David Soria Parra <dsp@php.net>
Date: Wed, 21 Mar 2012 17:12:16 +0000 (+0100)
Subject: Merge branch 'PHP-5.3' into PHP-5.4
X-Git-Tag: PHP-5.4.1-RC1~2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=4f81b4c649e998cb2d4756b8c6e4cd05f219bc4a;p=php

Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
  Use the NEWS merge driver if available
---

4f81b4c649e998cb2d4756b8c6e4cd05f219bc4a