Merge remote-tracking branch 'github/pr/637' into PHP-5.6
authorStanislav Malyshev <stas@php.net>
Sun, 19 Apr 2015 00:51:42 +0000 (17:51 -0700)
committerStanislav Malyshev <stas@php.net>
Sun, 19 Apr 2015 00:56:33 +0000 (17:56 -0700)
commitd66cb721d41b4a0d18dfec612f8a19e1c9b4de75
tree8a5a54eff82da29cdd605342d99da15017815c8d
parent1302eb7f7275c3f0b2b3af964dde91c44b769bbc
parent7e43b4f908711b4ad9708ed3460ef5a2d1776a22
Merge remote-tracking branch 'github/pr/637' into PHP-5.6

* github/pr/637:
  Remove unused code from ext/json.
ext/json/json.dsp
ext/json/package.xml