Automagical line endings fix
Merge branch 'master' of github.com:mwoodiupui/DSpace
Merge remote-tracking branch 'origin/master'