From: Adam Harvey <aharvey@php.net>
Date: Sun, 8 Dec 2013 03:42:00 +0000 (-0800)
Subject: Merge branch 'PHP-5.6'
X-Git-Tag: PRE_PHPNG_MERGE~353^2~147
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b97156113ea2a513c5fd167571ae40c0e2d1656d;p=php

Merge branch 'PHP-5.6'

* PHP-5.6:
  Switch to using freetype-config for freetype detection.
---

b97156113ea2a513c5fd167571ae40c0e2d1656d