]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.4' into PHP-5.5
authorChristopher Jones <sixd@php.net>
Mon, 5 Aug 2013 22:40:56 +0000 (15:40 -0700)
committerChristopher Jones <sixd@php.net>
Mon, 5 Aug 2013 22:40:56 +0000 (15:40 -0700)
* PHP-5.4:
  NEWS for recent DTrace merges. Remove redundant 'cp' during DTrace install.

1  2 
acinclude.m4

diff --cc acinclude.m4
Simple merge