From: jow <jow@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Tue, 5 Oct 2010 07:43:34 +0000 (+0000)
Subject: [backfire] merge r23231
X-Git-Url: http://207.154.207.93/?a=commitdiff_plain;h=a9d5337f669d5f189127359ada91e91b485bd6f3;p=10.03%2Fopenwrt.git

[backfire] merge r23231

git-svn-id: svn://svn.openwrt.org/openwrt/branches/backfire@23235 3c298f89-4303-0410-b956-a3cf2f4a3e73
---

diff --git a/package/firewall/Makefile b/package/firewall/Makefile
index 81aff2240..11dac8f41 100644
--- a/package/firewall/Makefile
+++ b/package/firewall/Makefile
@@ -32,6 +32,7 @@ endef
 
 define Package/firewall/conffiles
 /etc/config/firewall
+/etc/firewall.user
 endef
 
 define Package/firewall/install