aboutsummaryrefslogtreecommitdiff
path: root/manifests/rules/dns/git@git.fluxo.info:puppet-shorewall
diff options
context:
space:
mode:
authormh <mh@immerda.ch>2013-01-02 20:12:40 +0100
committermh <mh@immerda.ch>2013-01-02 20:12:40 +0100
commit00783476d162088eaf7a15a287316c2233ae5465 (patch)
tree7c06c2345292190747d5053256053e23ac337cc9 /manifests/rules/dns/git@git.fluxo.info:puppet-shorewall
parenteac5a3c28c4773531964f77e25291c88efcc5e12 (diff)
downloadpuppet-shorewall-00783476d162088eaf7a15a287316c2233ae5465.tar.gz
puppet-shorewall-00783476d162088eaf7a15a287316c2233ae5465.tar.bz2
cleanup a merge issue
Diffstat (limited to 'manifests/rules/dns/git@git.fluxo.info:puppet-shorewall')
0 files changed, 0 insertions, 0 deletions