fix
Merge branch 'master' of git://github.com/sprijk/dumpstr into sprijk-master
Merge branch 'sprijk-master'