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

Merge branch 'PHP-5.5' into PHP-5.6

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

627704b38e0c4ded81fb90524171546d77e2500e