From: Matteo Beccati <mbeccati@php.net>
Date: Wed, 3 Sep 2014 07:45:17 +0000 (+0200)
Subject: Merge branch 'PHP-5.6'
X-Git-Tag: PRE_PHP7_REMOVALS~137
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d1b0066df756396ade428569debe3816fc196683;p=php

Merge branch 'PHP-5.6'

* PHP-5.6:
  Fixed test with freetype >= 2.4.12
---

d1b0066df756396ade428569debe3816fc196683