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

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

dafad1e6632c8d0375cb79646a7fdf6b4647ad4f