]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.6'
authorMatteo Beccati <mbeccati@php.net>
Wed, 3 Sep 2014 07:45:17 +0000 (09:45 +0200)
committerMatteo Beccati <mbeccati@php.net>
Wed, 3 Sep 2014 07:45:17 +0000 (09:45 +0200)
* PHP-5.6:
  Fixed test with freetype >= 2.4.12


Trivial merge