From: Xinchen Hui <laruence@php.net>
Date: Sat, 9 Mar 2013 15:12:25 +0000 (+0800)
Subject: Merge branch 'PHP-5.5'
X-Git-Tag: php-5.6.0alpha1~483
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=12413b139374a87b6b864eb8e1b52f0ac0724007;p=php

Merge branch 'PHP-5.5'
---

12413b139374a87b6b864eb8e1b52f0ac0724007