DiD S2: used [filter_condition] for an event I missed and made logic clearer
DiD S2: removed the commented out 'black comedy' event
Merge branch 'master' of github.com:wesnoth/wesnoth