From: Nikita Popov <nikic@php.net>
Date: Sat, 24 Nov 2012 18:24:40 +0000 (+0100)
Subject: Merge branch 'PHP-5.5'
X-Git-Tag: php-5.6.0alpha1~697
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=6e1b84a646b9293dfa3af9fab470972ed19bcbed;p=php

Merge branch 'PHP-5.5'
---

6e1b84a646b9293dfa3af9fab470972ed19bcbed