]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.6'
authorMichael Wallner <mike@php.net>
Wed, 18 Feb 2015 13:05:10 +0000 (14:05 +0100)
committerMichael Wallner <mike@php.net>
Wed, 18 Feb 2015 13:05:10 +0000 (14:05 +0100)
* PHP-5.6:
  fix test


Trivial merge