]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 902c302 827100d)
Merge branch 'master' of https://git.php.net/repository/php-src
authorChristopher Jones <sixd@php.net>
Tue, 20 Aug 2013 12:40:48 +0000 (05:40 -0700)
committerChristopher Jones <sixd@php.net>
Tue, 20 Aug 2013 12:40:48 +0000 (05:40 -0700)
* '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


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