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

Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
  Always keep the NEWS file from the branch when merging
---

1e18f11c9ab56fb120c9e26ecd3f68f0651cddde