From: Nikita Popov <nikic@php.net>
Date: Sat, 23 Mar 2013 20:45:24 +0000 (+0100)
Subject: Merge branch 'PHP-5.5'
X-Git-Tag: php-5.6.0alpha1~448^2~100
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=5c591acc4fff694624e4ede4c4f9e83de917d5ec;p=php

Merge branch 'PHP-5.5'
---

5c591acc4fff694624e4ede4c4f9e83de917d5ec