[dmd-internals] [D-Programming-Language/dmd] 5f8db4: merge pul #1642

[GitHub]

  Branch: refs/heads/staging
  Home:   https://github.com/D-Programming-Language/dmd
  Commit: 5f8db467d95eedb89af8a7c95f99a2877045ce12
      https://github.com/D-Programming-Language/dmd/commit/5f8db467d95eedb89af8a7c95f99a2877045ce12
  Author: Walter Bright <walter at walterbright.com>
  Date:   2013-02-10 (Sun, 10 Feb 2013)

  Changed paths:
    M src/json.c
    M test/compilable/extra-files/json.out
    A test/compilable/imports/jsonimport1.d
    A test/compilable/imports/jsonimport2.d
    A test/compilable/imports/jsonimport3.d
    A test/compilable/imports/jsonimport4.d
    M test/compilable/json.d

  Log Message:
  -----------
  merge pul #1642