]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.6'
authorFerenc Kovacs <tyrael@php.net>
Mon, 7 Apr 2014 14:59:27 +0000 (16:59 +0200)
committerFerenc Kovacs <tyrael@php.net>
Mon, 7 Apr 2014 14:59:27 +0000 (16:59 +0200)
commita6e56586c6db787b2b0f06b07137294cd5e8e08f
treea64bf46608e78953fc8c1daf0b6bd0da55a77ef1
parent2000c8ed46b013d75deeed32750f3e3c8e081b55
parent7446766dabf6995ec7136e6da8fa5c1573696785
Merge branch 'PHP-5.6'

* PHP-5.6:
  add missing skip to the output, so we actually skip this test