From: Xinchen Hui <laruence@php.net>
Date: Sat, 27 Apr 2013 15:50:02 +0000 (+0800)
Subject: Merge branch 'PHP-5.3' into PHP-5.4
X-Git-Tag: php-5.5.0RC1~32^2~17^2~1
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=7b9eabaf51d6b91d250b19d78d400993231e2a64;p=php

Merge branch 'PHP-5.3' into PHP-5.4
---

7b9eabaf51d6b91d250b19d78d400993231e2a64