]> granicus.if.org Git - php/commit
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)
commit2508ce7aef7aa4a984d793e3c7f7898eaf6e8e03
treeb899301e0bbdfc056532b8fde6e94c3192a34ca6
parentf5517d16d68c1376c522d7cda20d21b7f999256a
parent24ed330a22288afec2bec156b6d5cf049e575b7f
Merge branch 'PHP-5.6'

* PHP-5.6:
  Fixed freetype test on multiple environments