]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.6'
authorJulien Pauli <jpauli@php.net>
Fri, 9 Jan 2015 15:25:14 +0000 (16:25 +0100)
committerJulien Pauli <jpauli@php.net>
Fri, 9 Jan 2015 15:25:14 +0000 (16:25 +0100)
* PHP-5.6:
  Updated NEWS
  Fix bug #68260

1  2 
ext/sqlite3/sqlite3.c

Simple merge