From: Christopher Jones <sixd@php.net>
Date: Mon, 5 Aug 2013 22:46:54 +0000 (-0700)
Subject: Merge branch 'PHP-5.5'
X-Git-Tag: php-5.6.0alpha1~336
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ca0497bba2222c282c39048776a9f61052e67643;p=php

Merge branch 'PHP-5.5'

* PHP-5.5:
  NEWS for recent DTrace merges. Remove redundant 'cp' during DTrace install.
  Fixed bug #62691 (solaris sed has no -i switch) Make 'make distclean' remove generated DTrace .h file
  Enable dtrace probes on linux as they are compatible with systemtap
  Fixed bug #63706: Cannot build PHP-5.5 with --enable-dtrace on Fedora 17
---

ca0497bba2222c282c39048776a9f61052e67643