]> git.parisson.com Git - timeside.git/commitdiff
Merge branch 'fix_streaming_bug' of github.com:yomguy/TimeSide into fix_streaming_bug
authorGuillaume Pellerin <yomguy@parisson.com>
Thu, 13 Feb 2014 23:07:10 +0000 (00:07 +0100)
committerGuillaume Pellerin <yomguy@parisson.com>
Thu, 13 Feb 2014 23:07:10 +0000 (00:07 +0100)

Trivial merge