]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.5' into PHP-5.6
authorAnatol Belski <ab@php.net>
Wed, 11 Dec 2013 13:16:07 +0000 (14:16 +0100)
committerAnatol Belski <ab@php.net>
Wed, 11 Dec 2013 13:16:07 +0000 (14:16 +0100)
* PHP-5.5:
  added missing prototype


Trivial merge