From: Xinchen Hui <laruence@php.net>
Date: Fri, 2 Aug 2013 10:43:17 +0000 (+0800)
Subject: Merge branch 'PHP-5.5'
X-Git-Tag: php-5.6.0alpha1~356
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=55d335fa9598c688dc02118bdf7bf239fdbb5c82;p=php

Merge branch 'PHP-5.5'
---

55d335fa9598c688dc02118bdf7bf239fdbb5c82