From: Andre Noll <maan@tuebingen.mpg.de>
Date: Sun, 10 Jul 2016 10:04:55 +0000 (+0200)
Subject: Merge branch 'refs/heads/t/autoplay-fix'
X-Git-Tag: v0.5.6~1
X-Git-Url: http://git.tue.mpg.de/?a=commitdiff_plain;h=f2940b2fbde865256bc35c74e3bd624d2ff48d2e;p=paraslash.git

Merge branch 'refs/heads/t/autoplay-fix'

A single commit which was cooking for a month.

* refs/heads/t/autoplay-fix:
  server: Fix --autoplay-delay.
---

f2940b2fbde865256bc35c74e3bd624d2ff48d2e