From: Dmitry Stogov <dmitry@zend.com>
Date: Wed, 27 Mar 2013 17:09:51 +0000 (+0400)
Subject: Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5
X-Git-Tag: php-5.5.0beta2~3
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=fc7efecda05b85634b87311400842678985c66aa;p=php

Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5

* 'PHP-5.5' of git.php.net:php-src:
  add WebP support in phpinfo
---

fc7efecda05b85634b87311400842678985c66aa