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

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  NEWS for recent DTrace merges. Remove redundant 'cp' during DTrace install.
---

18f17818a697269fbd93b9ec234640b67972eb23