merge r32127
authorJo-Philipp Wich <jow@openwrt.org>
Sun, 1 Jul 2012 10:32:51 +0000 (10:32 +0000)
committerJo-Philipp Wich <jow@openwrt.org>
Sun, 1 Jul 2012 10:32:51 +0000 (10:32 +0000)
commit39ae022f9a9069dab2f81cf5fbb87f4a10421b2e
treeb076164b0a376f0b5749b59356211db8f50138e8
parent047faad9a56bd38b5e327fb2d9577fe832c465ea
merge r32127

SVN-Revision: 32561
package/firewall/Makefile
package/firewall/files/firewall.config