]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 1ec430d 0c27a8e)
Merge branch 'PHP-5.5' into PHP-5.6
authorStanislav Malyshev <stas@php.net>
Sun, 22 Mar 2015 23:46:30 +0000 (16:46 -0700)
committerStanislav Malyshev <stas@php.net>
Sun, 22 Mar 2015 23:46:30 +0000 (16:46 -0700)
* PHP-5.5:
  Fix #68760: Fix freeing null segfault. Added test for behaviour.

Conflicts:
ext/sqlite3/tests/bug68760.phpt


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