Merge pull request #114 from roger-/master
authorsbyx <steven@midlink.org>
Tue, 22 Jul 2014 16:02:53 +0000 (18:02 +0200)
committersbyx <steven@midlink.org>
Tue, 22 Jul 2014 16:02:53 +0000 (18:02 +0200)
add mjpg-streamer


Trivial merge