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

Merge branch 'PHP-5.5'
---

c53b425763d4cdbc9dc5708e22c6517dfd5e1e09