From: Nikita Popov <nikic@php.net>
Date: Sat, 29 Jun 2013 19:57:36 +0000 (+0200)
Subject: Merge branch 'PHP-5.5'
X-Git-Tag: php-5.6.0alpha1~384^2~16^2~2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=4d606cf01e5b376cac1ac336f3e54ef480033028;p=php

Merge branch 'PHP-5.5'
---

4d606cf01e5b376cac1ac336f3e54ef480033028