From: Johannes Schlüter <johannes@php.net>
Date: Thu, 4 Apr 2013 13:38:35 +0000 (+0200)
Subject: Merge branch 'PHP-5.5'
X-Git-Tag: php-5.6.0alpha1~448^2~57^2~11
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e9cc55a803ef7db15ab0feb1029f5d7cb8b67c6a;p=php

Merge branch 'PHP-5.5'
---

e9cc55a803ef7db15ab0feb1029f5d7cb8b67c6a