]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.5' into PHP-5.6
authorJulien Pauli <jpauli@php.net>
Fri, 9 Jan 2015 15:24:32 +0000 (16:24 +0100)
committerJulien Pauli <jpauli@php.net>
Fri, 9 Jan 2015 15:24:32 +0000 (16:24 +0100)
commit138b6442d44c00c7a6c60fe7043ca6b202b7ce51
tree3301ef982bd7ea20848699ce79ad576d1b694656
parent0547edb5c239a8cbfb7a1d16d85ee365480527dd
parentdc810543cfaedd659a81507887e242a3680d5883
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Fix bug #68260
ext/sqlite3/sqlite3.c