From: Adam Harvey <aharvey@php.net>
Date: Sun, 8 Dec 2013 03:41:44 +0000 (-0800)
Subject: Merge branch 'PHP-5.5' into PHP-5.6
X-Git-Tag: php-5.6.0alpha1~123
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d40a5a2797970a316e32a3f6af18f0ce6e1c264a;p=php

Merge branch 'PHP-5.5' into PHP-5.6

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

d40a5a2797970a316e32a3f6af18f0ce6e1c264a