]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.5'
authorRemi Collet <remi@php.net>
Mon, 24 Jun 2013 09:04:10 +0000 (11:04 +0200)
committerRemi Collet <remi@php.net>
Mon, 24 Jun 2013 09:04:10 +0000 (11:04 +0200)
* PHP-5.5:
  Upstream fix from https://bitbucket.org/libgd/gd-libgd/issue/75


Trivial merge