fixup error loggins, catch parsing exceptions in editor, -p option
Merge branch 'master' of git://github.com/wesnoth/wesnoth