From: Joe Watkins <krakjoe@php.net>
Date: Tue, 10 Jan 2017 06:20:56 +0000 (+0000)
Subject: Merge branch 'PHP-7.0' into PHP-7.1
X-Git-Tag: php-7.1.2RC1~97
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=aadc84f6f749f05bc5d6cbf4f44a21734a9c6d3f;p=php

Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  Fixed #73902 mention router support in usage output for php-cli
---

aadc84f6f749f05bc5d6cbf4f44a21734a9c6d3f