]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.6'
authorAnatol Belski <ab@php.net>
Tue, 25 Nov 2014 16:57:51 +0000 (17:57 +0100)
committerAnatol Belski <ab@php.net>
Tue, 25 Nov 2014 16:57:51 +0000 (17:57 +0100)
* PHP-5.6:
  fix TS build


Trivial merge