Merge branches 'booking', 'sprit' and 'ust'
authorJoey Schulze <joey@infodrom.org>
Mon, 10 Jul 2017 20:49:16 +0000 (22:49 +0200)
committerJoey Schulze <joey@infodrom.org>
Mon, 10 Jul 2017 20:49:16 +0000 (22:49 +0200)

Trivial merge