From: Nikita Popov <nikic@php.net>
Date: Mon, 13 Aug 2012 20:06:18 +0000 (+0200)
Subject: Merge branch 'PHP-5.3' into PHP-5.4
X-Git-Tag: php-5.4.7RC1~69
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f19351b50330a3a838b8e3bba4ec95ebb5a8d5b7;p=php

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

f19351b50330a3a838b8e3bba4ec95ebb5a8d5b7