Merge remote-tracking branch 'naglis/nosvideo'
authorPhilipp Hagemeister <phihag@phihag.de>
Mon, 15 Sep 2014 14:10:52 +0000 (16:10 +0200)
committerPhilipp Hagemeister <phihag@phihag.de>
Mon, 15 Sep 2014 14:10:52 +0000 (16:10 +0200)

Trivial merge