From: Xinchen Hui <laruence@php.net>
Date: Tue, 6 Aug 2013 07:39:46 +0000 (+0800)
Subject: Merge branch 'PHP-5.5'
X-Git-Tag: php-5.6.0alpha1~335^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=9b38673776fdd2501119acea04f9c5869a007cf1;p=php

Merge branch 'PHP-5.5'
---

9b38673776fdd2501119acea04f9c5869a007cf1