]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.5'
authorMichael Wallner <mike@php.net>
Thu, 12 Dec 2013 11:10:08 +0000 (12:10 +0100)
committerMichael Wallner <mike@php.net>
Thu, 12 Dec 2013 11:10:08 +0000 (12:10 +0100)
* PHP-5.5:
  fix test


Trivial merge