]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.6'
authorAnatol Belski <ab@php.net>
Thu, 21 May 2015 08:57:30 +0000 (10:57 +0200)
committerAnatol Belski <ab@php.net>
Thu, 21 May 2015 08:57:30 +0000 (10:57 +0200)
* PHP-5.6:
  remove duplicated declaration, fix build


Trivial merge