From: Stanislav Malyshev <stas@php.net>
Date: Mon, 27 Jan 2014 01:21:14 +0000 (-0800)
Subject: Merge branch 'PHP-5.5' into PHP-5.6
X-Git-Tag: PRE_PHPNG_MERGE~388^2~3^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=223a62d69eeace864cb5deb45e3a56eb3ac3beaa;p=php

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Fix English and improve by Stas. Thanks :)
  Update source docs
  Revert "Update source docs"
  Update source docs

Conflicts:
	README.EXTENSIONS
---

223a62d69eeace864cb5deb45e3a56eb3ac3beaa