]> granicus.if.org Git - php/commit
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)
commitd1b0066df756396ade428569debe3816fc196683
tree32e645e6f19c5411003cb015177ce561c0ce840e
parentb0f0211b1ae695809f72a8a241649cda6ecd38bb
parent627704b38e0c4ded81fb90524171546d77e2500e
Merge branch 'PHP-5.6'

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