[mjpegtools/el7: 2/2] Merge branch 'master' into el7
commit 653c7bd4d54cb8b743a98bfa880796986612943f
Merge: 69a3909 1cffb57
Author: sagitter <sagitter(a)fedoraproject.org>
Date: Thu Dec 6 17:10:07 2018 +0100
Merge branch 'master' into el7
---