From: Lars Strojny <lstrojny@php.net>
Date: Fri, 14 Dec 2012 13:56:25 +0000 (+0100)
Subject: Merge branch 'PHP-5.4' into PHP-5.5
X-Git-Tag: php-5.5.0alpha2~7
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=aaa5e42177c2b8eac77ff25b7b4335a1c2b9f214;p=php

Merge branch 'PHP-5.4' into PHP-5.5
---

aaa5e42177c2b8eac77ff25b7b4335a1c2b9f214