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

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

1433854681d8cd37803873b2f891a8d60d77cc3c