From: Xinchen Hui <laruence@php.net>
Date: Mon, 24 Jun 2013 15:49:45 +0000 (+0800)
Subject: Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5
X-Git-Tag: php-5.5.2RC1~34
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=47035ba5c97bcf00f10262fbd4ab07a7d653b93b;p=php

Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5
---

47035ba5c97bcf00f10262fbd4ab07a7d653b93b