From: Nikita Popov <nikic@php.net>
Date: Wed, 30 Jan 2013 19:25:59 +0000 (+0100)
Subject: Merge branch 'PHP-5.3' into PHP-5.4
X-Git-Tag: php-5.5.0alpha5~48^2~2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=bb4d11b405ae1f37a8b0e4db630e80c5678f0746;p=php

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

bb4d11b405ae1f37a8b0e4db630e80c5678f0746