]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.4'
authorAnatoliy Belsky <ab@php.net>
Tue, 16 Oct 2012 09:14:11 +0000 (11:14 +0200)
committerAnatoliy Belsky <ab@php.net>
Tue, 16 Oct 2012 09:14:11 +0000 (11:14 +0200)
commit3c89f8507f5c476135e7b3ceead4837271dff421
treedc73c20d3d5880679efdc99729c3b78a583a4c38
parent9aacdf6e892fe46526e1e60a3b3fea1b1c350699
parent6d019deee206dd76396bcaff9497ae3619d279b0
Merge branch 'PHP-5.4'

* PHP-5.4:
  Fixed bug #63248 Load multiple magic files on win

Conflicts:
NEWS