]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.6' into PHP-7.0
authorAnatol Belski <ab@php.net>
Wed, 3 Aug 2016 10:19:29 +0000 (12:19 +0200)
committerAnatol Belski <ab@php.net>
Wed, 3 Aug 2016 10:19:29 +0000 (12:19 +0200)
* PHP-5.6:
  fix ts build


Trivial merge