From: Christopher Jones <sixd@php.net>
Date: Fri, 16 Aug 2013 17:49:05 +0000 (-0700)
Subject: Merge branch 'PHP-5.4' into PHP-5.5
X-Git-Tag: php-5.5.6RC1~27
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=4b4ffaf703a243db6bb1026a339376d089dec72d;p=php

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  With --enable-dtrace, the correct PIC/non-PIC .o files on Solaris and Linux are now used.  DTrace is part of Oracle Linux.  See https://oss.oracle.com/projects/DTrace/
---

4b4ffaf703a243db6bb1026a339376d089dec72d