From: andrey <andrey@php.net>
Date: Fri, 29 Jun 2012 11:40:41 +0000 (+0300)
Subject: Merge branch 'PHP-5.3' of ssh://git.php.net/php-src into PHP-5.3
X-Git-Tag: php-5.3.15RC1~7
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=1ac611f24f03728e4d9cd717e83331e2e17184d2;p=php

Merge branch 'PHP-5.3' of ssh://git.php.net/php-src into PHP-5.3
---

1ac611f24f03728e4d9cd717e83331e2e17184d2