Merge branch 'PHP-7.1'

7.1.x release shouldn't have been pn mainline PHP-7.1 branch
Fix the merge history to keep master in place.

* PHP-7.1:
  bump versions
This commit is contained in:
Sara Golemon 2017-05-23 16:29:11 -07:00
commit 92056aee85

Diff Content Not Available