From: Nikita Popov <nikic@php.net>
Date: Fri, 29 Mar 2013 10:43:19 +0000 (+0100)
Subject: Merge branch 'PHP-5.5'
X-Git-Tag: PRE_PHPNG_MERGE~227^2~15^2~1
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=2f4c3ff330fb041af542ea8f051e7286985dd44c;p=php

Merge branch 'PHP-5.5'
---

2f4c3ff330fb041af542ea8f051e7286985dd44c