From: Lars Strojny <lstrojny@php.net>
Date: Tue, 21 Aug 2012 08:09:56 +0000 (+0200)
Subject: Merge branch 'master' of git://github.com/php/php-src
X-Git-Tag: php-5.5.0alpha1~20^2~37
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c4fecc1c5d44481a4088f6028ce6910f2ce4e0dc;p=php

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

c4fecc1c5d44481a4088f6028ce6910f2ce4e0dc