From: Joe Watkins <krakjoe@php.net>
Date: Tue, 10 Jan 2017 06:21:14 +0000 (+0000)
Subject: Merge branch 'PHP-7.1'
X-Git-Tag: php-7.2.0alpha1~561
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e54ee3eaa4f1391679556e7f4ec153e194ca520e;p=php

Merge branch 'PHP-7.1'

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

e54ee3eaa4f1391679556e7f4ec153e194ca520e