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)

Trivial merge