Merge branch 'travis-rtmp'
authorPhilipp Hagemeister <phihag@phihag.de>
Sun, 25 Jan 2015 04:30:47 +0000 (05:30 +0100)
committerPhilipp Hagemeister <phihag@phihag.de>
Sun, 25 Jan 2015 04:30:47 +0000 (05:30 +0100)
commit767ff0a2d19a162edc5ea2d33e82ddb30ae244c8
tree00d5eca6ac7825372448e4206bcc99b200c376d7
parent8604e882a8f99fcd632efbb94e449477d860218d
parente1ccc04e9f68988df0520b7502edc6479b62378f
Merge branch 'travis-rtmp'