From: Pierre Joye <pierre.php@gmail.com>
Date: Thu, 11 Apr 2013 05:08:39 +0000 (+0200)
Subject: Merge branch 'PHP-5.4' into PHP-5.5
X-Git-Tag: php-5.5.0beta4~43
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e71b7945698c4df46c30d14108e61af2953ae233;p=php

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  lucky that the name is not used, fix name of encoder
---

e71b7945698c4df46c30d14108e61af2953ae233