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

Merge branch 'PHP-5.5' into PHP-5.6

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

61e1f79585dd610b0390be4792ef3e98906644af