From: Johannes Schlüter <johannes@php.net>
Date: Tue, 29 Jan 2013 18:49:39 +0000 (+0100)
Subject: Merge branch 'PHP-5.4' of git.php.net:/php-src into PHP-5.4
X-Git-Tag: php-5.4.12RC1~3
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=264279439b5707ecbc21ad06c8f48d3ffd6bd862;p=php

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

264279439b5707ecbc21ad06c8f48d3ffd6bd862