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

Merge branch 'PHP-5.5'

* PHP-5.5:
  Add an empty make command for DTrace .d files to stop an implicit circular dependency in GNU Make which causes .d files to be overwritten (Bug 61268)
  Merge branch 'PHP-5.4'
---

8fdf1ad32d8d9a752b757f17c52757f32a462c3f