From: Christopher Jones <sixd@php.net>
Date: Wed, 31 Jul 2013 17:00:05 +0000 (-0700)
Subject: Merge branch 'PHP-5.5'
X-Git-Tag: php-5.6.0alpha1~365
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f5521a357ad77fd71e6e783711c206a063bfebb3;p=php

Merge branch 'PHP-5.5'

* PHP-5.5:
  Fixed bug #62691 (solaris sed has no -i switch) Make 'make distclean' remove generated DTrace .h file
---

f5521a357ad77fd71e6e783711c206a063bfebb3