aboutsummaryrefslogtreecommitdiff
path: root/lib/puppet
diff options
context:
space:
mode:
authorintrigeri <intrigeri@boum.org>2010-11-21 16:38:50 +0100
committerintrigeri <intrigeri@boum.org>2010-11-21 16:38:50 +0100
commit71d42350d1edb643a20e651a6c4ab965e6903305 (patch)
treee0928f5e4b9164528e6be3fd36efbf8256ddb09f /lib/puppet
parentd30069c178ff2aff9154f65bd7dbf988c4d002f1 (diff)
parent1b0bc415977c1c8b49390e0cdb1361769e0fdbae (diff)
downloadpuppet-apt-71d42350d1edb643a20e651a6c4ab965e6903305.tar.gz
puppet-apt-71d42350d1edb643a20e651a6c4ab965e6903305.tar.bz2
Merge commit '1b0bc415977c1c8b49390e0cdb1361769e0fdbae'.
Merging one more commit. Conflicts: files/preferences templates/Debian/sources.list.deb-src.erb templates/Debian/sources.list.volatile.erb templates/Ubuntu/sources.list.backports.erb templates/Ubuntu/sources.list.deb-src.erb
Diffstat (limited to 'lib/puppet')
0 files changed, 0 insertions, 0 deletions