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

Merge branch 'PHP-5.5'
---

c3c4ff98acf5858a899fa112b0d1be4e21a401a4