From: Andrey Hristov <andrey@php.net>
Date: Wed, 26 Jun 2013 14:50:08 +0000 (+0200)
Subject: Merge branch 'PHP-5.4' into PHP-5.5
X-Git-Tag: php-5.5.2RC1~19
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=781be5f1d74ea9406e9ab82f9f90844befcc67b3;p=php

Merge branch 'PHP-5.4' into PHP-5.5

Conflicts:
	NEWS
---

781be5f1d74ea9406e9ab82f9f90844befcc67b3