aboutsummaryrefslogtreecommitdiff
path: root/templates
diff options
context:
space:
mode:
authorMicah Anderson <micah@riseup.net>2009-08-27 19:47:12 -0400
committerMicah Anderson <micah@riseup.net>2009-08-27 19:47:12 -0400
commit08d43f8c6d6a60f456cb82f2fb270f48470c96d7 (patch)
treea178e6a1adc2adaba86d9ed08ca007fad97a7aa1 /templates
parent8c72b1b43a428ccebb2b629ed60f06ff71650c17 (diff)
parent6734c256525e1dd42ba3648db82083bcabca66ed (diff)
downloadpuppet-backupninja-08d43f8c6d6a60f456cb82f2fb270f48470c96d7.tar.gz
puppet-backupninja-08d43f8c6d6a60f456cb82f2fb270f48470c96d7.tar.bz2
Merge commit '6734c256525e1dd42ba3648db82083bcabca66ed'
Conflicts: manifests/dup.pp
Diffstat (limited to 'templates')
0 files changed, 0 insertions, 0 deletions