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

Merge branch 'PHP-5.5'
---

416e2708358d5cfbb72958da7328e834c4b8d07a