]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.4' into PHP-5.5
authorAnatol Belski <ab@php.net>
Mon, 14 Apr 2014 21:30:14 +0000 (23:30 +0200)
committerAnatol Belski <ab@php.net>
Mon, 14 Apr 2014 21:30:14 +0000 (23:30 +0200)
* PHP-5.4:
  fix windows build

1  2 
ext/session/mod_files.c

Simple merge