aboutsummaryrefslogtreecommitdiff
path: root/templates
diff options
context:
space:
mode:
authorintrigeri <intrigeri@boum.org>2010-10-17 04:45:09 +0200
committerintrigeri <intrigeri@boum.org>2010-10-17 04:45:09 +0200
commitf79bf97ec82e8adcf002ca6834b0df66f28e61f2 (patch)
tree3b8258b0736051e1c641a58c06b96d716e0d4889 /templates
parentf9c1086afb6c343fe65e989413acb80cb7d5cb86 (diff)
parentc49625a4cd14a53d91b7d12aea88201a211a26a2 (diff)
downloadpuppet-shorewall-f79bf97ec82e8adcf002ca6834b0df66f28e61f2.tar.gz
puppet-shorewall-f79bf97ec82e8adcf002ca6834b0df66f28e61f2.tar.bz2
Merge remote branch 'riseup/master'
Conflicts: files/debian/default manifests/init.pp templates/debian/default templates/debian_default.erb
Diffstat (limited to 'templates')
0 files changed, 0 insertions, 0 deletions