From: Christoph M. Becker <cmb@php.net>
Date: Mon, 13 Jul 2015 15:50:26 +0000 (+0200)
Subject: Merge branch 'master' of http://git.php.net/repository/php-src
X-Git-Tag: php-7.1.1RC1~35^2~10
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=2a2d3e88e6722d9277097d8e6a39f2e40a8befb9;p=php

Merge branch 'master' of http://git.php.net/repository/php-src

# By Christoph M. Becker (3) and Bob Weinand (2)
* 'master' of http://git.php.net/repository/php-src:
  updated NEWS
  updated NEWS
  Fix #69024: imagescale segfault with palette based image
  Fix weird asm instruction order with gcc by marking as volatile in phpdbg
  Preserve return value in zend_vm_call_opcode_handler with global opline/ex registers enabled
---

2a2d3e88e6722d9277097d8e6a39f2e40a8befb9