Merge branch 'refs/heads/t/para_play_fixes'
authorAndre Noll <maan@tuebingen.mpg.de>
Sat, 30 Jan 2016 12:07:11 +0000 (13:07 +0100)
committerAndre Noll <maan@tuebingen.mpg.de>
Sat, 30 Jan 2016 12:07:11 +0000 (13:07 +0100)
commit75695bba841fc43094ebc669418187080cea00e6
treece4d2540c12e00c2cad3c5f3ae968c48284e12e4
parent42841acf754b7187a01b37248d2740be57c0a67a
parentc0162946c2124d1afd09bc7fc3b0aa4bb386f9f8
Merge branch 'refs/heads/t/para_play_fixes'

Was cooking in next since 2015-10-25.

* refs/heads/t/para_play_fixes:
  i9e: Avoid key binding macros.
  play: Fix off-by-one in jmp 100.
play.c