From: Anatol Belski <ab@php.net>
Date: Tue, 26 Jul 2016 14:29:54 +0000 (+0200)
Subject: Merge branch 'PHP-7.1'
X-Git-Tag: php-7.2.0alpha1~1558^2~130
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=495e58648288d617664b9d4d78908f57131a2287;p=php

Merge branch 'PHP-7.1'

* PHP-7.1:
  fix broken proto doc
---

495e58648288d617664b9d4d78908f57131a2287