From: Stanislav Malyshev <stas@php.net>
Date: Sun, 22 Mar 2015 23:46:30 +0000 (-0700)
Subject: Merge branch 'PHP-5.5' into PHP-5.6
X-Git-Tag: php-5.6.8RC1~42
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=40037f1474fcd1317cfcc13412cd0a3a588e3896;p=php

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Fix #68760: Fix freeing null segfault. Added test for behaviour.

Conflicts:
	ext/sqlite3/tests/bug68760.phpt
---

40037f1474fcd1317cfcc13412cd0a3a588e3896