]> granicus.if.org Git - php/commit
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)
commit716387288e48f6fab6782e2591025f35e93dd9d9
treee10fe32a843d9641a5a468df6d8054f08206df62
parentb6803c75d90a9e1b1d3e60b2e3b19eb5f6c4d6f2
parentcdabbd9542a41bb2a1ce3b1d85b88003e0a1a19c
Merge branch 'PHP-5.6'

* PHP-5.6:
  test requires imagejpeg(); skip otherwise