From: Nikita Popov <nikic@php.net>
Date: Mon, 13 Aug 2012 20:06:43 +0000 (+0200)
Subject: Merge branch 'PHP-5.4'
X-Git-Tag: php-5.5.0alpha1~20^2~88
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=5bf4c5f82c2124d1733c114547e7077af0ff4055;p=php

Merge branch 'PHP-5.4'
---

5bf4c5f82c2124d1733c114547e7077af0ff4055