From: Johannes Schlüter <johannes@php.net>
Date: Mon, 10 Dec 2012 12:32:50 +0000 (+0100)
Subject: Merge branch 'PHP-5.3' into PHP-5.4
X-Git-Tag: php-5.5.0alpha2~32^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=bd36d4901caedda52ff2e39469af34fb0bd15089;p=php

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

bd36d4901caedda52ff2e39469af34fb0bd15089