From: Yasuo Ohgaki <yohgaki@php.net>
Date: Thu, 29 Jan 2015 00:26:55 +0000 (+0900)
Subject: Merge branch 'PHP-5.5' into PHP-5.6
X-Git-Tag: php-5.6.6RC1~27
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=5f28622e0911735422de03f2915dd3911ddbdbaf;p=php

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Fixed Bug #68941 mod_files.sh is a bash-script
---

5f28622e0911735422de03f2915dd3911ddbdbaf
diff --cc NEWS
index 5674921d5d,09eeb31281..3533fb00ad
--- a/NEWS
+++ b/NEWS
@@@ -31,6 -29,6 +31,9 @@@
  - Phar:
    . Fixed bug #68901 (use after free). (bugreports at internot dot info)
  
++- Session:
++  . Fixed bug #68941 (mod_files.sh is a bash-script) (bugzilla at ii.nl, Yasuo)
++
  - Sqlite3:
    . Fixed bug #68260 (SQLite3Result::fetchArray declares wrong 
      required_num_args). (Julien)