aboutsummaryrefslogtreecommitdiff
path: root/templates/Debian/preferences_squeeze.erb
diff options
context:
space:
mode:
authorJerome Charaoui <jcharaoui@cmaisonneuve.qc.ca>2015-02-20 16:15:02 -0500
committerJerome Charaoui <jcharaoui@cmaisonneuve.qc.ca>2015-02-20 16:15:02 -0500
commit8ed07cac2f084bfe542f4978daa783aedd7e79b4 (patch)
tree93020168f8979b317c3a7c93e2b8ec154078385a /templates/Debian/preferences_squeeze.erb
parente3e0b46ca6039170c2d2faa8b2bebf14460679eb (diff)
parent53e78e61fefefe85939a3c3b5efcd147deebca61 (diff)
downloadpuppet-apt-8ed07cac2f084bfe542f4978daa783aedd7e79b4.tar.gz
puppet-apt-8ed07cac2f084bfe542f4978daa783aedd7e79b4.tar.bz2
Merge branch 'master' of git://git.puppet.immerda.ch/module-apt
Conflicts: templates/Debian/sources.list.erb
Diffstat (limited to 'templates/Debian/preferences_squeeze.erb')
0 files changed, 0 insertions, 0 deletions