]> 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 17:12:16 +0000 (18:12 +0100)
committerDavid Soria Parra <dsp@php.net>
Wed, 21 Mar 2012 17:12:16 +0000 (18:12 +0100)
commit4f81b4c649e998cb2d4756b8c6e4cd05f219bc4a
tree40dc136eba14999edae16d8bda8da32bc4f26467
parent54f0d50d3e7f23637de827c995a5bda64827640c
parentca797ca31ecae10f705789fbf870a6f02e8b5f17
Merge branch 'PHP-5.3' into PHP-5.4

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