]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.3' into PHP-5.4
authorDavid Soria Parra <dsp@php.net>
Wed, 21 Mar 2012 11:41:40 +0000 (12:41 +0100)
committerDavid Soria Parra <dsp@php.net>
Wed, 21 Mar 2012 11:41:40 +0000 (12:41 +0100)
commit1e18f11c9ab56fb120c9e26ecd3f68f0651cddde
treea71cc58816dda5c23fcdfbb43728c35a1e058351
parentf3f0ced4bbf119b55ae85002087484688d355f68
parent944e622821ebd8ab62bcb3513f6b9e7bcc998b04
Merge branch 'PHP-5.3' into PHP-5.4

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