From: Lars Strojny <lstrojny@php.net>
Date: Sun, 6 Jan 2013 13:55:05 +0000 (+0100)
Subject: Merge branch 'PHP-5.5'
X-Git-Tag: php-5.6.0alpha1~619^2~1
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=925da6b14db28776168ca4b6005f5eb8352d6e46;p=php

Merge branch 'PHP-5.5'
---

925da6b14db28776168ca4b6005f5eb8352d6e46