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

Merge branch 'PHP-5.5'
---

004163a914d907e8d649392ba715bdf2df8a2402