From: Johannes Schlüter <johannes@php.net>
Date: Tue, 23 Jul 2013 11:15:15 +0000 (+0200)
Subject: Merge branch 'PHP-5.5'
X-Git-Tag: php-5.6.0alpha1~376^2~6
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=6b4742582f0b23617423c8e949a8fbc8cf72f749;p=php

Merge branch 'PHP-5.5'
---

6b4742582f0b23617423c8e949a8fbc8cf72f749