]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 756dc19 49fbe25)
Merge branch 'PHP-5.5' into PHP-5.6
authorDmitry Stogov <dmitry@zend.com>
Fri, 8 Nov 2013 10:15:41 +0000 (14:15 +0400)
committerDmitry Stogov <dmitry@zend.com>
Fri, 8 Nov 2013 10:15:41 +0000 (14:15 +0400)
* PHP-5.5:
  Added tests for PHAR/OPCahce incompatibilities
  Update NEWS
  Fixed bug #65947 (basename is no more working after fgetcsv in certain situation)
  Update NEWS
  Fixed Bug #66043 (Segfault calling bind_param() on mysqli)
  NEWS entry
  NEWS entry

Conflicts:
NEWS


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