aboutsummaryrefslogtreecommitdiff
path: root/manifests/dist_upgrade
diff options
context:
space:
mode:
authorintrigeri <intrigeri@boum.org>2015-02-28 12:34:54 +0000
committerintrigeri <intrigeri@boum.org>2015-02-28 12:34:54 +0000
commit31f8661eea49b05f32ccca4ad3d628548ba54b77 (patch)
tree93020168f8979b317c3a7c93e2b8ec154078385a /manifests/dist_upgrade
parent7c55bee06ab952c914b3a367f495e36a2539807f (diff)
parent8ed07cac2f084bfe542f4978daa783aedd7e79b4 (diff)
downloadpuppet-apt-31f8661eea49b05f32ccca4ad3d628548ba54b77.tar.gz
puppet-apt-31f8661eea49b05f32ccca4ad3d628548ba54b77.tar.bz2
Merge branch 'master' into 'master'
Merge with cmaisonnneuve and immerda See merge request !4
Diffstat (limited to 'manifests/dist_upgrade')
0 files changed, 0 insertions, 0 deletions