]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.6'
authorXinchen Hui <laruence@php.net>
Tue, 7 Jul 2015 13:38:24 +0000 (21:38 +0800)
committerXinchen Hui <laruence@php.net>
Tue, 7 Jul 2015 13:38:24 +0000 (21:38 +0800)
commitca1ba39102d3e209d4c8a04b46316e9c8b7521e4
tree77bfce47da72370aa1d4bf9f00d58560e9b722d0
parent5bd315657c41601803bf5cf2528fdd373fdfdf48
parent26471eb69c3cd9e8162ff3b398d33919d9075191
Merge branch 'PHP-5.6'

Conflicts:
ext/sqlite3/sqlite3.c
ext/sqlite3/sqlite3.c