Merge branch 'PHP-5.6' into PHP-7.0

author Christoph M. Becker <cmbecker69@gmx.de>

Fri, 2 Sep 2016 22:30:05 +0000 (00:30 +0200)

committer Christoph M. Becker <cmbecker69@gmx.de>

Fri, 2 Sep 2016 22:30:05 +0000 (00:30 +0200)
author Christoph M. Becker <cmbecker69@gmx.de>
Fri, 2 Sep 2016 22:30:05 +0000 (00:30 +0200)
committer Christoph M. Becker <cmbecker69@gmx.de>
Fri, 2 Sep 2016 22:30:05 +0000 (00:30 +0200)
diff --cc ext/sqlite3/tests/sqlite3_21_security.phpt
Simple merge
author	Christoph M. Becker <cmbecker69@gmx.de>
	Fri, 2 Sep 2016 22:30:05 +0000 (00:30 +0200)
committer	Christoph M. Becker <cmbecker69@gmx.de>
	Fri, 2 Sep 2016 22:30:05 +0000 (00:30 +0200)