Merge remote-tracking branch 'upstream/master' into movie-playback

author Dermot Duffy <dermot.duffy@gmail.com>

Tue, 1 Nov 2016 21:11:47 +0000 (21:11 +0000)

committer Dermot Duffy <dermot.duffy@gmail.com>

Tue, 1 Nov 2016 21:11:47 +0000 (21:11 +0000)
author Dermot Duffy <dermot.duffy@gmail.com>
Tue, 1 Nov 2016 21:11:47 +0000 (21:11 +0000)
committer Dermot Duffy <dermot.duffy@gmail.com>
Tue, 1 Nov 2016 21:11:47 +0000 (21:11 +0000)
diff --cc motioneye/handlers.py
Simple merge
diff --cc motioneye/static/js/main.js
Simple merge
author	Dermot Duffy <dermot.duffy@gmail.com>
	Tue, 1 Nov 2016 21:11:47 +0000 (21:11 +0000)
committer	Dermot Duffy <dermot.duffy@gmail.com>
	Tue, 1 Nov 2016 21:11:47 +0000 (21:11 +0000)
		1	2
motioneye/handlers.py	patch \|	diff1 \|	diff2 \|	blob \| history
motioneye/static/js/main.js	patch \|	diff1 \|	diff2 \|	blob \| history