From: Dermot Duffy <dermot.duffy@gmail.com>
Date: Tue, 1 Nov 2016 21:11:47 +0000 (+0000)
Subject: Merge remote-tracking branch 'upstream/master' into movie-playback
X-Git-Url: http://www.vanbest.org/gitweb/?a=commitdiff_plain;h=077dd7297a318672844207ec7caa0c13180e4ab3;p=motioneye-debian

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

077dd7297a318672844207ec7caa0c13180e4ab3