[phobos] [D-Programming-Language/installer] 2e0b39: cleanup leftover from merge conflict

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/D-Programming-Language/installer
  Commit: 2e0b3994ca757731326e2f75aa60c9b8060c63ac
      https://github.com/D-Programming-Language/installer/commit/2e0b3994ca757731326e2f75aa60c9b8060c63ac
  Author: Martin Nowak <code at dawg.eu>
  Date:   2014-01-20 (Mon, 20 Jan 2014)

  Changed paths:
    M create_dmd_release/create_dmd_release.d

  Log Message:
  -----------
  cleanup leftover from merge conflict


  Commit: 795bbc01fe49b1ae44797c982e4b5b6b8f7e4353
      https://github.com/D-Programming-Language/installer/commit/795bbc01fe49b1ae44797c982e4b5b6b8f7e4353
  Author: Martin Nowak <code at dawg.eu>
  Date:   2014-01-20 (Mon, 20 Jan 2014)

  Changed paths:
    M create_dmd_release/create_dmd_release.d

  Log Message:
  -----------
  fix expanding zip files created on Windows

- replace path seperator ('\\' with '/')
- ignore windows specific file attributes


  Commit: e98d4781e3f744cad50d12956f256e25e0e044cd
      https://github.com/D-Programming-Language/installer/commit/e98d4781e3f744cad50d12956f256e25e0e044cd
  Author: AndrewEdwards <edwards.ac at gmail.com>
  Date:   2014-01-20 (Mon, 20 Jan 2014)

  Log Message:
  -----------
  Merge branch 'master' of git://github.com/D-Programming-Language/installer


Compare: https://github.com/D-Programming-Language/installer/compare/0d7653e710e6...e98d4781e3f7