]> granicus.if.org Git - php/commit
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)
commit18f17818a697269fbd93b9ec234640b67972eb23
tree1f247fe48bd9ddb9269b01a15fa83cbe11214295
parent6e89818f2f0f5cff16ce319fdc2bde8d7aa8951d
parent47d66a0b4ea83bc4e1c9bfaa5c478cd42e28337c
Merge branch 'PHP-5.4' into PHP-5.5

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