]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.5'
authorDavid Soria Parra <dsp@php.net>
Tue, 4 Dec 2012 20:02:23 +0000 (21:02 +0100)
committerDavid Soria Parra <dsp@php.net>
Tue, 4 Dec 2012 20:02:23 +0000 (21:02 +0100)
* PHP-5.5:
  Overwrite execute_ex instead of execute in dtrace_execute
  Enable dtrace probes on linux as they are compatible with systemtap


Trivial merge