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

[fenris02]

commit fcefd84649e844203792afba67b13b8202ae30a7
Merge: ddb1fef 69bc0d8
Author: d. johnson <fenris02 at fedoraproject.org>
Date:   Mon Sep 15 08:38:55 2014 -0500

    Merge branch 'master' of ssh://pkgs.fedoraproject.org/munin
    
    Conflicts:
    	munin.spec

 munin.spec |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)
---
diff --cc munin.spec
index 3d70dd3,0d8c6ec..69f6106
--- a/munin.spec
+++ b/munin.spec
@@@ -1,6 -1,6 +1,6 @@@
  Name:           munin
  Version:        2.0.21
--Release:        6%{?dist}
++Release:        7%{?dist}
  Summary:        Network-wide graphing framework (grapher/gatherer)
  
  Group:          System Environment/Daemons
@@@ -824,9 -819,9 +824,12 @@@ exit 
  
  
  %changelog
+ * Mon Sep 15 2014 Petr Pisar <ppisar at redhat.com> - 2.0.21-6
+ - Build against perl 5.20
+ 
 +* Sun Sep 14 2014 "D. Johnson" <fenris02 at fedoraproject.org> - 2.0.21-6
 +- Add amavis plugin config defaults
 +
  * Sun Sep 07 2014 "D. Johnson" <fenris02 at fedoraproject.org> - 2.0.21-5
  - BZ# 1114857 - munin-2.0.21-2.fc21 FTBFS: No Package found for java-1.7.0-devel
  - re-merge earlier commit for epel7