From: Andrey Hristov <andrey@php.net>
Date: Thu, 8 Aug 2013 12:05:08 +0000 (+0200)
Subject: Merge branch 'PHP-5.4' into PHP-5.5
X-Git-Tag: php-5.5.2~26
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c9243344a0d4c3a8352a21ba36b7739ca9aaa279;p=php

Merge branch 'PHP-5.4' into PHP-5.5
---

c9243344a0d4c3a8352a21ba36b7739ca9aaa279