From: Andrey Hristov <andrey@php.net>
Date: Wed, 26 Jun 2013 14:51:42 +0000 (+0200)
Subject: Merge branch 'PHP-5.5'
X-Git-Tag: php-5.6.0alpha1~386
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=793694b9d838b095aa47bdce6e9fa60a3074dafd;p=php

Merge branch 'PHP-5.5'
---

793694b9d838b095aa47bdce6e9fa60a3074dafd