From: Christopher Jones <sixd@php.net>
Date: Mon, 5 Aug 2013 22:35:46 +0000 (-0700)
Subject: Merge branch 'PHP-5.4' into PHP-5.5
X-Git-Tag: php-5.5.2~34^2~1
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=6e89818f2f0f5cff16ce319fdc2bde8d7aa8951d;p=php

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  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

Conflicts:
	Makefile.global
---

6e89818f2f0f5cff16ce319fdc2bde8d7aa8951d