Khalifate melee attack sound timings fix.
Merge branch '1.12' of github.com:wesnoth/wesnoth into 1.12