From: Moriyoshi Koizumi <mozo@mozo.jp>
Date: Mon, 2 Apr 2012 17:00:23 +0000 (+0900)
Subject: Merge branch 'PHP-5.3' into PHP-5.4
X-Git-Tag: php-5.4.4RC1~165
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=43047598c4e4ed76daa82ff509e46c40087f0ea4;p=php

Merge branch 'PHP-5.3' into PHP-5.4

Conflicts:
	NEWS
---

43047598c4e4ed76daa82ff509e46c40087f0ea4