From: Stanislav Malyshev <stas@php.net>
Date: Wed, 24 Apr 2013 05:03:42 +0000 (-0700)
Subject: Merge branch 'PHP-5.4' into PHP-5.5
X-Git-Tag: php-5.5.0beta4~14
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=920c7ac16eaf7478fe419a362df53d01d208bfc2;p=php

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  update credits
---

920c7ac16eaf7478fe419a362df53d01d208bfc2