From: Andre Noll <maan@tuebingen.mpg.de>
Date: Sat, 30 Jan 2016 12:07:11 +0000 (+0100)
Subject: Merge branch 'refs/heads/t/para_play_fixes'
X-Git-Tag: v0.5.6~61
X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=commitdiff_plain;h=75695bba841fc43094ebc669418187080cea00e6;hp=75695bba841fc43094ebc669418187080cea00e6

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.
---