From: Lars Strojny <lstrojny@php.net>
Date: Sat, 19 Jan 2013 00:06:13 +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~3^2~3
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=087a1887022cbf7c3cc981c9ea8217f93736aa80;p=php

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

087a1887022cbf7c3cc981c9ea8217f93736aa80