summaryrefslogtreecommitdiff
path: root/templates/Debian
diff options
context:
space:
mode:
authorintrigeri <intrigeri@boum.org>2010-11-21 16:41:56 +0100
committerintrigeri <intrigeri@boum.org>2010-11-21 16:41:56 +0100
commitf22861e820dc2c7f638561a2704dff19810daa66 (patch)
treef73f4192205053459f7da4c94532a6bb5b21c726 /templates/Debian
parent71d42350d1edb643a20e651a6c4ab965e6903305 (diff)
parent27d5808299045ebd6f428e7d8131d11d9ab37712 (diff)
Merge commit '27d5808299045ebd6f428e7d8131d11d9ab37712'.
One more painless merge commit. Conflicts: manifests/init.pp
Diffstat (limited to 'templates/Debian')
0 files changed, 0 insertions, 0 deletions