From: Julien Pauli <jpauli@php.net>
Date: Thu, 18 Jul 2013 09:12:01 +0000 (+0200)
Subject: Merge branch 'PHP-5.5'
X-Git-Tag: php-5.6.0alpha1~377^2~6
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c8befa4f7cc0e98c33c9934c51dfccbb6c618a2f;p=php

Merge branch 'PHP-5.5'
---

c8befa4f7cc0e98c33c9934c51dfccbb6c618a2f