aboutsummaryrefslogtreecommitdiff
path: root/templates
diff options
context:
space:
mode:
authorintrigeri <intrigeri@boum.org>2010-11-10 10:11:18 +0100
committerintrigeri <intrigeri@boum.org>2010-11-10 10:19:06 +0100
commit2cd9496999af2dd00a203f38c4e1f4393c7f3f62 (patch)
treea74f18ccf51d7f48752b37d3a8f39705972eac05 /templates
parentc43bfac6b80489cf789fe448abb3561a6655a969 (diff)
parent5bf01f148d2c2db8523febc0d73591444c5965c9 (diff)
downloadpuppet-apt-2cd9496999af2dd00a203f38c4e1f4393c7f3f62.tar.gz
puppet-apt-2cd9496999af2dd00a203f38c4e1f4393c7f3f62.tar.bz2
Merge remote branch 'nadir/master'
Conflicts: README manifests/custom_sources.pp manifests/default_preferences.pp manifests/init.pp manifests/unattended_upgrades.pp templates/Debian/sources.list.volatile.erb
Diffstat (limited to 'templates')
0 files changed, 0 insertions, 0 deletions