[dmd-internals] [D-Programming-Language/dmd] 31d675: partial merge of D2 pull 380

[noreply at github.com]

  Branch: refs/heads/dmd-1.x
  Home:   https://github.com/D-Programming-Language/dmd

  Commit: 31d6751de3a877c72055a2096a9a9c4a9a25ec9b
      https://github.com/D-Programming-Language/dmd/commit/31d6751de3a877c72055a2096a9a9c4a9a25ec9b
  Author: Walter Bright <walter at walterbright.com>
  Date:   2011-09-14 (Wed, 14 Sep 2011)

  Changed paths:
    M src/cond.c
  M src/declaration.c
  M src/dsymbol.c
  M src/expression.c
  M src/expression.h
  M src/func.c
  M src/interpret.c
  M src/lexer.c
  M src/mars.c
  M src/mars.h
  M src/mtype.c
  M src/mtype.h
  M src/template.c
  M src/template.h
  M src/traits.c

  Log Message:
  -----------
  partial merge of D2 pull 380