From: Xinchen Hui <laruence@php.net>
Date: Fri, 29 Mar 2013 15:49:35 +0000 (+0800)
Subject: Merge branch 'PHP-5.5'
X-Git-Tag: PRE_PHPNG_MERGE~227^2~13
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ac9f53dd9c0b184bab14d669c72971c0405ed488;p=php

Merge branch 'PHP-5.5'
---

ac9f53dd9c0b184bab14d669c72971c0405ed488