Merge branch 'refs/heads/t/autoplay-fix'
authorAndre Noll <maan@tuebingen.mpg.de>
Sun, 10 Jul 2016 10:04:55 +0000 (12:04 +0200)
committerAndre Noll <maan@tuebingen.mpg.de>
Sun, 10 Jul 2016 10:04:55 +0000 (12:04 +0200)
A single commit which was cooking for a month.

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


Trivial merge