From: Johannes Schlüter <johannes@php.net>
Date: Wed, 4 Jul 2012 23:18:57 +0000 (+0200)
Subject: Merge branch 'PHP-5.3' into PHP-5.4
X-Git-Tag: php-5.4.6RC1~69^2~9
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=9a38ca8d5097c9cbebe21a56e64d3b331764b0be;p=php

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

9a38ca8d5097c9cbebe21a56e64d3b331764b0be