From: Christoph M. Becker <cmb@php.net>
Date: Fri, 31 Jul 2015 11:54:32 +0000 (+0200)
Subject: Merge branch 'PHP-5.6'
X-Git-Tag: php-7.0.0beta3~5^2~36
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=716387288e48f6fab6782e2591025f35e93dd9d9;p=php

Merge branch 'PHP-5.6'

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

716387288e48f6fab6782e2591025f35e93dd9d9