From: Christopher Jones <sixd@php.net>
Date: Tue, 20 Aug 2013 12:40:48 +0000 (-0700)
Subject: Merge branch 'master' of https://git.php.net/repository/php-src
X-Git-Tag: php-5.6.0alpha1~282
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=96d435f9ae862c9a272f531104d25e86eaeddc40;p=php

Merge branch 'master' of https://git.php.net/repository/php-src

* 'master' of https://git.php.net/repository/php-src:
  split the glob() test to test different basedir
  Add session.use_strict_mode description to php.ini-*
  Revert wrong description
  bump version
  Fixed test bug
  Update NEWS
---

96d435f9ae862c9a272f531104d25e86eaeddc40