Merge remote-tracking branch 'origin/pr/226'

diff --cc src/dvr/dvr_rec.c
index 39b929e79a93f61e8dffa45745a3aa59348543fe,0c98f533fa1a2b0c71bc8dc47418d6ed672f62e8..39b929e79a93f61e8dffa45745a3aa59348543fe
mode 100755,100644..100644
--- 1/src/dvr/dvr_rec.c
--- 2/src/dvr/dvr_rec.c
+++ b/src/dvr/dvr_rec.c

diff --cc src/htsp_server.c
Simple merge

diff --cc src/streaming.c
index 2e0cace3408a73c8e64cbbec4b08e070e2204974,3173d3b0cd48f17dc810e7db16cd6d88736a430d..2e0cace3408a73c8e64cbbec4b08e070e2204974
mode 100755,100644..100644
--- 1/src/streaming.c
--- 2/src/streaming.c
+++ b/src/streaming.c

diff --cc src/webui/webui.c
Simple merge