[zoneminder/f27: 10/10] Merge branch 'master' into f27

commit 6e733433a8ba294634eb13935611e51e6ed4d8b6 Merge: e19166f d06a60f Author: Andrew Bauer <zonexpertconsulting(a)outlook.com&gt; Date: Tue Oct 2 08:05:21 2018 -0500 Merge branch 'master' into f27 .gitignore | 1 + sources | 4 ++++ zoneminder.spec | 6 +++++- 3 files changed, 10 insertions(+), 1 deletion(-) --- diff --cc sources index c5b1f39,56949e4..ee30735 --- a/sources +++ b/sources @@@ -1,3 -1,3 +1,7 @@@ 9ac5569ffaf82e4339d97af7fbe0d392 cakephp-enum-behavior-1.0-zm.tar.gz 86ae07e6ee1cd06ee6f608a85a5da808 crud-3.1.0-zm.tar.gz ++<<<<<<< HEAD +020459b357f66987700a8ab63fd7aeea zoneminder-1.32.0.tar.gz ++======= + 7c2a358a1a22b13f0bd5e346eab4b84a zoneminder-1.32.1.tar.gz ++>>>>>>> master