]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 83fc53a 9be591b)
Merge branch 'PHP-5.4' into PHP-5.5
authorRemi Collet <remi@php.net>
Thu, 20 Jun 2013 06:42:30 +0000 (08:42 +0200)
committerRemi Collet <remi@php.net>
Thu, 20 Jun 2013 06:42:30 +0000 (08:42 +0200)
* PHP-5.4:
  skip test for bug #64936 when tokenizer not built


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.