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

Conflicts:
ext/sqlite3/sqlite3.c


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