From: Lars Strojny <lstrojny@php.net>
Date: Tue, 15 Jan 2013 21:12:09 +0000 (+0100)
Subject: Merge branch 'PHP-5.5'
X-Git-Tag: php-5.6.0alpha1~588
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=85a949d9d4c5b216d6581f62df6b7d5b4787c130;p=php

Merge branch 'PHP-5.5'
---

85a949d9d4c5b216d6581f62df6b7d5b4787c130