]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.6'
authorStanislav Malyshev <stas@php.net>
Sun, 19 Apr 2015 00:57:18 +0000 (17:57 -0700)
committerStanislav Malyshev <stas@php.net>
Sun, 19 Apr 2015 00:57:18 +0000 (17:57 -0700)
commit8fa7800ce1101f7721de223acfea733cee344a4d
tree05e6e79cf3f9c6786bd682de753ef532c6698eb2
parent494870fded9ede88d02f59b6333ffd9848ee512f
parentd66cb721d41b4a0d18dfec612f8a19e1c9b4de75
Merge branch 'PHP-5.6'

* PHP-5.6:
  Remove unused code from ext/json.

Conflicts:
ext/json/config.m4
ext/json/config.w32
ext/json/json.dsp
ext/json/package.xml