From: Xinchen Hui <laruence@gmail.com>
Date: Wed, 4 Apr 2012 07:24:08 +0000 (+0800)
Subject: Merge branch 'PHP-5.3' into PHP-5.4
X-Git-Tag: php-5.4.4RC1~158
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=bd400829af7144321eb20feb727bb35597fc15ef;p=php

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

bd400829af7144321eb20feb727bb35597fc15ef