From: Pierre Joye <pierre.php@gmail.com>
Date: Thu, 11 Apr 2013 05:08:58 +0000 (+0200)
Subject: Merge branch 'PHP-5.5'
X-Git-Tag: php-5.6.0alpha1~448^2~39^2~1
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e2f3c7f2bc3853bb485b5a84abcef1958a96ccee;p=php

Merge branch 'PHP-5.5'

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

e2f3c7f2bc3853bb485b5a84abcef1958a96ccee