From 9ad97721591d43a6838a341a69ff518f9845dec3 Mon Sep 17 00:00:00 2001
From: Jiri Popelka <jpopelka@redhat.com>
Date: Aug 27 2014 08:40:58 +0000
Subject: Merge branch 'f20' into f21


---

diff --git a/firewalld.spec b/firewalld.spec
index 8cf449d..950f4dc 100644
--- a/firewalld.spec
+++ b/firewalld.spec
@@ -1,7 +1,7 @@
 Summary: A firewall daemon with D-Bus interface providing a dynamic firewall
 Name: firewalld
 Version: 0.3.11
-Release: 2%{?dist}
+Release: 3%{?dist}
 URL: http://fedorahosted.org/firewalld
 License: GPLv2+
 Source0: https://fedorahosted.org/released/firewalld/%{name}-%{version}.tar.bz2
@@ -317,6 +317,9 @@ fi
 %endif
 
 %changelog
+* Wed Aug 27 2014 Jiri Popelka <jpopelka@redhat.com> - 0.3.11-3
+- Quiet systemctl if cups-browsed.service is not installed
+
 * Mon Aug 25 2014 Jiri Popelka <jpopelka@redhat.com> - 0.3.11-2
 - add few Requires to spec (RHBZ#1133167)