From: Remi Collet <remi@php.net>
Date: Thu, 20 Jun 2013 06:42:30 +0000 (+0200)
Subject: Merge branch 'PHP-5.4' into PHP-5.5
X-Git-Tag: php-5.5.2RC1~50^2~2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=60afd3fce4071ba79fbabfb828b12ad1421bd2d0;p=php

Merge branch 'PHP-5.4' into PHP-5.5

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

60afd3fce4071ba79fbabfb828b12ad1421bd2d0