luci-0.11: merge r9362 and r9363
authorManuel Munz <freifunk@somakoma.de>
Wed, 10 Oct 2012 19:24:38 +0000 (19:24 +0000)
committerManuel Munz <freifunk@somakoma.de>
Wed, 10 Oct 2012 19:24:38 +0000 (19:24 +0000)
commit25a1e70804d51f36145f4e8aca800f273a533a29
tree7f990805858e246c7ee20121b51757b3975c121a
parent0a6c627ac704e65a2191501764ad8c8799152317
luci-0.11: merge r9362 and r9363
contrib/package/freifunk-p2pblock/Makefile
contrib/package/freifunk-p2pblock/files/freifunk-p2pblock.init