]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.6' into PHP-7.0
authorChristoph M. Becker <cmb@php.net>
Wed, 27 Jul 2016 14:47:09 +0000 (16:47 +0200)
committerChristoph M. Becker <cmb@php.net>
Wed, 27 Jul 2016 14:48:29 +0000 (16:48 +0200)
commit23c359c27614a8b30afd860f2543912d1b297d08
tree6b12f605c3df382816c98c35eb27d958e4068003
parent0d2c4f822c614c544df736a30dffc00104fdbd57
parentcc125f277b50e0f90fc8033fe7f47d2446389a15
Merge branch 'PHP-5.6' into PHP-7.0

# Resolved conflicts:
# ext/sqlite3/sqlite3.c
NEWS
ext/sqlite3/sqlite3.c