From: Johannes Schlüter <johannes@php.net>
Date: Wed, 12 Sep 2012 21:01:11 +0000 (+0200)
Subject: Merge branch 'master' of git.php.net:/php-src
X-Git-Tag: php-5.5.0alpha1~20^2~22^2~1
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=7ae66c5a16e57fc87f37f821d3a722b851b3f751;p=php

Merge branch 'master' of git.php.net:/php-src
---

7ae66c5a16e57fc87f37f821d3a722b851b3f751