From: Andrey Hristov <andrey@php.net>
Date: Mon, 8 Jul 2013 18:24:58 +0000 (+0200)
Subject: Merge branch 'PHP-5.4' into PHP-5.5
X-Git-Tag: php-5.5.2RC1~18
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3dd5f4ae4c91d97ed02f74cc849075a7d5c1a92c;p=php

Merge branch 'PHP-5.4' into PHP-5.5

Conflicts:
	NEWS
---

3dd5f4ae4c91d97ed02f74cc849075a7d5c1a92c