From: Johannes Schlüter <johannes@php.net>
Date: Thu, 21 Feb 2013 14:11:09 +0000 (+0100)
Subject: Merge branch 'PHP-5.5'
X-Git-Tag: php-5.6.0alpha1~517
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=4642d0e0d61d7271b1d35e4ab03025d44b8cab88;p=php

Merge branch 'PHP-5.5'
---

4642d0e0d61d7271b1d35e4ab03025d44b8cab88