]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.6'
authorJakub Zelenka <bukka@php.net>
Sun, 22 Feb 2015 20:54:05 +0000 (20:54 +0000)
committerJakub Zelenka <bukka@php.net>
Sun, 22 Feb 2015 20:54:05 +0000 (20:54 +0000)
commitad2b751985a9f812c1a1e21455b33d2af58d9cd0
tree3a06ceb03bdc63b49a37dc72daa020132cb90ae4
parent485345a7f19f87dc8e932f2666a999850c9c7243
parent97d809a8a57cb7bc5833917d9e4eeddad749b53b
Merge branch 'PHP-5.6'

The fix for master is a bit different (it's fixed in encoder)
ext/json/json_encoder.c