]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.5'
authorRemi Collet <remi@php.net>
Thu, 20 Jun 2013 06:43:11 +0000 (08:43 +0200)
committerRemi Collet <remi@php.net>
Thu, 20 Jun 2013 06:43:11 +0000 (08:43 +0200)
commita964c5def8c66939ef6cb0f9aaa5e12b0de737d3
tree2d8b402821ac4d48b790db1a230c171a3c55b7ec
parentf77e3be102c7dfb6c03384820774f54f5d7ba6f3
parent60afd3fce4071ba79fbabfb828b12ad1421bd2d0
Merge branch 'PHP-5.5'

* PHP-5.5:
  skip test for bug #64936 when tokenizer not built