From: Christoph M. Becker <cmb@php.net>
Date: Tue, 23 Jun 2015 23:15:44 +0000 (+0200)
Subject: Merge branch 'master' of https://git.php.net/repository/php-src
X-Git-Tag: php-7.0.0beta1~12^2~49^2~16
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=27e557a169629991f899b2088100ec3a6ee67e88;p=php

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

# By Rasmus Lerdorf (3) and others
# Via Rasmus Lerdorf
* 'master' of https://git.php.net/repository/php-src:
  Fix more proto comments
  prepare NEWS for next
  Fix more minor mistakes in the proto comments
  Avoid op_num = -1 in unfinished generator cleanup
  Fix incorrect protos
---

27e557a169629991f899b2088100ec3a6ee67e88