]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.5'
authorPierre Joye <pierre.php@gmail.com>
Tue, 8 Jan 2013 14:16:35 +0000 (15:16 +0100)
committerPierre Joye <pierre.php@gmail.com>
Tue, 8 Jan 2013 14:16:35 +0000 (15:16 +0100)
commitf566b4d32183032663ecb35895c0dafd8e051853
treecea62c1623f1667f3ed92194b9d701c20a05ef51
parent7a13ce61e02d1894224a0c3009dac74990666926
parent10a2c0d574be62be1f0224d23909e27e74c87445
Merge branch 'PHP-5.5'

* PHP-5.5:
  - fix bug #47358, glob returns error, should be empty array()
  - NEWS entry for #50524