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)
commitacd9db590293bd914a0ec02e76cae546fd6e473f
treed337b4d98c5dceef83736639d2bf973208fd285b
parentc15dd1538882be9614ebf3b6100e52b659022146
parentd0e8b3d59bbb0951a4bf7e85baca8c40d3824dd6
Merge remote-tracking branch 'naglis/nosvideo'