From: Remi Collet <remi@php.net>
Date: Mon, 24 Jun 2013 09:15:56 +0000 (+0200)
Subject: Merge branch 'PHP-5.5'
X-Git-Tag: php-5.6.0alpha1~402
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=8e4e38aaeea0944a976fd2629c210c87483dcb3f;p=php

Merge branch 'PHP-5.5'

* PHP-5.5:
  fix imagecreatefromwebp and imagewebp protos
---

8e4e38aaeea0944a976fd2629c210c87483dcb3f