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)
commitc8f83ad2cecfa99a57652e2df5c3e67c50d5e5dc
tree8c683aa21cd3f50e6e1c1e6ff9c84dcefa3e35b4
parent1a19268176cea0a89a44c469be7847e8e6b65211
parent0e8a2fc996146355733113d75ca6b9a0a71fad2d
parentdf7538224c4748dc832c0622893a5344ce06ff95
parent89129d8a812bbfb515b36b016102a133cfe4d19e
Merge branches 'booking', 'sprit' and 'ust'