]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.5' into PHP-5.6
authorAnatol Belski <ab@php.net>
Fri, 12 Sep 2014 12:36:54 +0000 (14:36 +0200)
committerAnatol Belski <ab@php.net>
Fri, 12 Sep 2014 12:36:54 +0000 (14:36 +0200)
* PHP-5.5:
  fixed the cast and incompatible pointer warning


Trivial merge