]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 13d4d8e 6d019de)
Merge branch 'PHP-5.4' of git.php.net:php-src into PHP-5.4
authorULF WENDEL <uw@php.net>
Sat, 29 Sep 2012 16:55:42 +0000 (18:55 +0200)
committerULF WENDEL <uw@php.net>
Sat, 29 Sep 2012 16:55:42 +0000 (18:55 +0200)
* 'PHP-5.4' of git.php.net:php-src:
  Fixed bug #63248 Load multiple magic files on win


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.