]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.4'
authorJohannes Schlüter <johannes@php.net>
Fri, 22 Jun 2012 10:50:55 +0000 (12:50 +0200)
committerJohannes Schlüter <johannes@php.net>
Fri, 22 Jun 2012 10:50:55 +0000 (12:50 +0200)
* PHP-5.4:
  Improve check for :memory: pseudo-filename in SQlite


Trivial merge