From: Xinchen Hui <laruence@gmail.com>
Date: Thu, 12 Dec 2013 17:46:28 +0000 (+0800)
Subject: Merge remote-tracking branch 'origin/PHP-5.5' into PHP-5.6
X-Git-Tag: php-5.6.0alpha1~119^2~3
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ab12ccd16ae3bb1a4f208731ec93bf8833996947;p=php

Merge remote-tracking branch 'origin/PHP-5.5' into PHP-5.6
---

ab12ccd16ae3bb1a4f208731ec93bf8833996947