dolphin-emu/dolphin — pull request #801 by FioraAeterna (2014-08-14 16:32:23+00:00)
Title: JIT: correctly set skipNext even if conditional-continue is off

Part 2: I missed the other branch-merging case in the first commit.