aboutsummaryrefslogtreecommitdiff
path: root/files/boilerplate/params.footer
diff options
context:
space:
mode:
authormh <mh@immerda.ch>2013-01-02 19:34:31 +0100
committermh <mh@immerda.ch>2013-01-02 19:34:31 +0100
commit58103ed409fc61d8e653babb73fcaf510969f3db (patch)
tree0c022f3ff326248cc7194d3d1e5c768acfbcb399 /files/boilerplate/params.footer
parent2f388687ea30fdefdcd405807a0fce699807809d (diff)
parentfaf6fba9579e285efd28f2ef96a7e3a5d4a5dd4b (diff)
downloadpuppet-shorewall-58103ed409fc61d8e653babb73fcaf510969f3db.tar.gz
puppet-shorewall-58103ed409fc61d8e653babb73fcaf510969f3db.tar.bz2
Merge remote-tracking branch 'varac/master'
Conflicts: files/boilerplate/providers.footer files/boilerplate/providers.header manifests/base.pp manifests/providers.pp
Diffstat (limited to 'files/boilerplate/params.footer')
0 files changed, 0 insertions, 0 deletions