From: Johannes Schlüter <johannes@php.net>
Date: Wed, 12 Sep 2012 21:35:29 +0000 (+0200)
Subject: Merge branch 'PHP-5.3' into PHP-5.4
X-Git-Tag: php-5.4.9RC1~34^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b93675d60b3b751178ca01ab84785315ea2a693a;p=php

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

b93675d60b3b751178ca01ab84785315ea2a693a