Merge branch 'PHP-5.5' into PHP-5.6
authorAnatol Belski <ab@php.net>
Mon, 12 Jan 2015 16:02:18 +0000 (17:02 +0100)
committerAnatol Belski <ab@php.net>
Mon, 12 Jan 2015 16:02:18 +0000 (17:02 +0100)
commitedb66e05dbe10a7506fcdd1c7ecce4bd105c9c92
tree04ab4b8c0952eecac86119fcb17b3ea89b4f6158
parent344a61a613b622627a4bd142277b72da6f000684
parentef5862253480ee9f6be0dd4dc6c7d87b0a5cc935
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Fixed bug #68771 SQL syntax error in sqlite lib