Merge commit '5f2c8315b3c1b28da0386fddb118ad6a0ed77a0c'
authorDerek Buitenhuis <derek.buitenhuis@gmail.com>
Wed, 18 Nov 2015 16:46:57 +0000 (16:46 +0000)
committerDerek Buitenhuis <derek.buitenhuis@gmail.com>
Wed, 18 Nov 2015 16:46:57 +0000 (16:46 +0000)
commit518742bc21f7baa4c9059e9705fca131d4e3a87a
tree6ccae1acd3e981e0688d30bc113a8743850b45f0
parentbdcf2b6af64b64d7c83339f75d7a909ed50c6562
parent5f2c8315b3c1b28da0386fddb118ad6a0ed77a0c
Merge commit '5f2c8315b3c1b28da0386fddb118ad6a0ed77a0c'

This is a no-op.

* commit '5f2c8315b3c1b28da0386fddb118ad6a0ed77a0c':
  thp: set duration for audio stream too

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>