]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.5' into PHP-5.6
authorJulien Pauli <jpauli@php.net>
Thu, 25 Jun 2015 17:13:20 +0000 (19:13 +0200)
committerJulien Pauli <jpauli@php.net>
Thu, 25 Jun 2015 17:13:20 +0000 (19:13 +0200)
* PHP-5.5:
  fix unknown size of void error


Trivial merge