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

  Commit: ff9fa25f3f7f3091787f7459e1950add6cff50b2
      https://github.com/D-Programming-Language/dmd/commit/ff9fa25f3f7f3091787f7459e1950add6cff50b2
  Author: Walter Bright <walter at walterbright.com>
  Date:   2012-01-01 (Sun, 01 Jan 2012)

  Changed paths:
    M src/dsymbol.c
  M src/expression.c
  M src/import.c
  M src/import.h
  M src/module.c

  Log Message:
  -----------
  Merge pull request #591 from ckamm/bug314

Updated fix for bug 314 (previously pull request 190).