[zoneminder: 2/2] Merge branch 'master' of ssh://pkgs.fedoraproject.org/zoneminder

[Jason ティビツ]

commit f4d83265de393d6e6c6ba79bf338568385e7095e
Merge: 6539dcf 52c37be
Author: Jason Tibbitts <tibbs at math.uh.edu>
Date:   Tue Mar 10 11:52:31 2015 -0500

    Merge branch 'master' of ssh://pkgs.fedoraproject.org/zoneminder

 ...nder-1.25.0-Fix-some-compilation-warnings.patch | 28 +++++++++++++
 zoneminder.spec                                    | 49 ++++++++++++++++++----
 2 files changed, 70 insertions(+), 7 deletions(-)
---