From: mh <mh@immerda.ch>
Date: Thu, 16 Aug 2012 07:35:21 +0000 (+0200)
Subject: Merge remote-tracking branch 'shared/master'
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=0c2f31b5d5c972c179cb06ea1a06e6e0e7b1b262;p=puppet-apt.git

Merge remote-tracking branch 'shared/master'

Conflicts:
	README
	manifests/dist_upgrade/initiator.pp
	manifests/init.pp
	manifests/preseeded_package.pp
	manifests/unattended_upgrades.pp
---

0c2f31b5d5c972c179cb06ea1a06e6e0e7b1b262