From: Lars Strojny <lstrojny@php.net>
Date: Mon, 14 Jan 2013 20:41:24 +0000 (+0100)
Subject: Merge branch 'PHP-5.5' of git://github.com/php/php-src into PHP-5.5
X-Git-Tag: php-5.5.0alpha4~13
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3ea2b73a30885c8fe308b7103442373cbb8d1543;p=php

Merge branch 'PHP-5.5' of git://github.com/php/php-src into PHP-5.5
---

3ea2b73a30885c8fe308b7103442373cbb8d1543