]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5
authorDmitry Stogov <dmitry@zend.com>
Wed, 27 Mar 2013 17:09:51 +0000 (21:09 +0400)
committerDmitry Stogov <dmitry@zend.com>
Wed, 27 Mar 2013 17:09:51 +0000 (21:09 +0400)
* 'PHP-5.5' of git.php.net:php-src:
  add WebP support in phpinfo


Trivial merge