From: Anatoliy Belsky <ab@php.net>
Date: Thu, 23 Aug 2012 11:35:30 +0000 (+0200)
Subject: Merge branch 'PHP-5.3' into PHP-5.4
X-Git-Tag: php-5.4.7RC1~18
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e4a3696553a7bd1059b994da489617041804abea;p=php

Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
  ZTS fix introduced by Felipe must also go into 5.3
  Updated INSTALL. Generated from the XML Docs.
  Update NEWS given a5d0c1e2

Conflicts:
	NEWS
---

e4a3696553a7bd1059b994da489617041804abea