From: Pierrick Charron <pierrick@php.net>
Date: Thu, 7 Jun 2012 16:05:01 +0000 (+0200)
Subject: Merge branch 'PHP-5.4'
X-Git-Tag: php-5.5.0alpha1~123
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=4c98206a6091af415bd4ab209de71c1417dcca28;p=php

Merge branch 'PHP-5.4'

* PHP-5.4:
  Regenerated files
  Regenerated files
---

4c98206a6091af415bd4ab209de71c1417dcca28