From: Johannes Schlüter <johannes@php.net>
Date: Wed, 16 Jan 2013 16:38:41 +0000 (+0100)
Subject: Merge branch 'PHP-5.3' into PHP-5.4
X-Git-Tag: php-5.4.12RC1~4
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a85ae16e74d0f1025f2505ea462c566491396fab;p=php

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

a85ae16e74d0f1025f2505ea462c566491396fab