From: Calin Crisan <ccrisan@gmail.com>
Date: Sun, 28 May 2017 09:41:45 +0000 (+0300)
Subject: Merge branch 'master' of git@github.com:ccrisan/motioneye.git
X-Git-Url: http://www.vanbest.org/gitweb/?a=commitdiff_plain;h=a07203cdabee7680245bd9a5c5432e3dee1f11cc;p=motioneye-debian

Merge branch 'master' of git@github.com:ccrisan/motioneye.git

Conflicts:
	motioneye/server.py
---

a07203cdabee7680245bd9a5c5432e3dee1f11cc