]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.6'
authorMatteo Beccati <mbeccati@php.net>
Tue, 16 Sep 2014 08:23:03 +0000 (10:23 +0200)
committerMatteo Beccati <mbeccati@php.net>
Tue, 16 Sep 2014 08:23:03 +0000 (10:23 +0200)
* PHP-5.6:
  Fixed freetype test on multiple environments


Trivial merge