From: David Soria Parra <dsp@php.net>
Date: Tue, 4 Dec 2012 20:02:23 +0000 (+0100)
Subject: Merge branch 'PHP-5.5'
X-Git-Tag: php-5.6.0alpha1~672^2~43
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e4c1aa33aba812a2625a149905fcca52c2bc9557;p=php

Merge branch 'PHP-5.5'

* PHP-5.5:
  Overwrite execute_ex instead of execute in dtrace_execute
  Enable dtrace probes on linux as they are compatible with systemtap
---

e4c1aa33aba812a2625a149905fcca52c2bc9557