From: Anatol Belski <ab@php.net>
Date: Sun, 5 Jan 2014 18:21:27 +0000 (+0100)
Subject: Merge branch 'PHP-5.4' into PHP-5.5
X-Git-Tag: php-5.6.0alpha1~46^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=748e707bf94cf3353616727ade7c3a79ef5de25f;p=php

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  one more extension for the basename test
---

748e707bf94cf3353616727ade7c3a79ef5de25f