From: Xinchen Hui <laruence@php.net>
Date: Sun, 19 Aug 2012 10:34:58 +0000 (+0800)
Subject: Merge branch 'master' of git.php.net:php-src
X-Git-Tag: php-5.5.0alpha1~20^2~53^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=94a1d0de2ad46cf1224609a85cafe39ad3372de1;p=php

Merge branch 'master' of git.php.net:php-src
---

94a1d0de2ad46cf1224609a85cafe39ad3372de1