From: Andrey Hristov <andrey@php.net>
Date: Wed, 4 Dec 2013 10:07:18 +0000 (+0200)
Subject: Merge branch 'PHP-5.4' into PHP-5.5
X-Git-Tag: php-5.5.8RC1~40
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ceb1b7e20fdbbdb121a67242d0848ab923915e65;p=php

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

ceb1b7e20fdbbdb121a67242d0848ab923915e65