From: Remi Collet <remi@php.net>
Date: Fri, 28 Feb 2014 07:12:16 +0000 (+0100)
Subject: Merge branch 'PHP-5.4' into PHP-5.5
X-Git-Tag: php-5.5.11RC1~49
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=5fc7382a57550c8997cf00c0839916c78766bfe5;p=php

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  man page: long option name is --strip, not --stripped
  --global have be removed in 5.2
---

5fc7382a57550c8997cf00c0839916c78766bfe5