]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.5' into PHP-5.6
authorAnatol Belski <ab@php.net>
Wed, 25 Mar 2015 12:13:42 +0000 (13:13 +0100)
committerAnatol Belski <ab@php.net>
Wed, 25 Mar 2015 12:13:42 +0000 (13:13 +0100)
commitc9550e81da92785dabe15f8f9ff9d9c6ca12c4c6
treef8d5a9ebf84c01dced1a756238d57fdc4302f95c
parent3924548bcb6be47beeee348ed9b01ab2d64ae3a7
parent1b41dcf9c57b2fe5aecaf42412832d1739f44583
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Fixed bug #69287 upgrade bundled sqlite to 3.8.8.3
  fix dir separator in test