From: Matteo Beccati <mbeccati@php.net>
Date: Tue, 16 Sep 2014 08:22:49 +0000 (+0200)
Subject: Merge branch 'PHP-5.5' into PHP-5.6
X-Git-Tag: php-5.6.4RC1~59^2~33
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=24ed330a22288afec2bec156b6d5cf049e575b7f;p=php

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Fixed freetype test on multiple environments
---

24ed330a22288afec2bec156b6d5cf049e575b7f