]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.6'
authorChristoph M. Becker <cmb@php.net>
Fri, 31 Jul 2015 11:54:32 +0000 (13:54 +0200)
committerChristoph M. Becker <cmb@php.net>
Fri, 31 Jul 2015 11:54:32 +0000 (13:54 +0200)
* PHP-5.6:
  test requires imagejpeg(); skip otherwise


Trivial merge