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)
commitf2940b2fbde865256bc35c74e3bd624d2ff48d2e
tree77be8f50eea41d2f56f491053e01071462719401
parent92d85d340495154f3fda23f322af13fc9de42155
parente4efba96ba3f2d77eb75fc27631e590c8be3c879
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.