typofix
Merge branch 'master' of github.com:mrled/dhd
taskpaper from Windows
conflict resolution