intrigeri d30069c178 Merge commit 'd97a49b7b2c020c2c43df6524236f50a421789ee'. ... Going on merging immerda changes. Incompatible change: I do prefer my own generic apt/preferences template to shipping a static file that only supports Lenny. My own template supports security, backports, volatile, next release etc. Conflicts: files/preferences manifests/init.pp manifests/preferences.pp		2010-11-21 16:31:42 +01:00
..
02show_upgraded	Add apt_conf_snippet and use it where possible	2010-10-24 09:17:09 -04:00
03clean	Add apt_conf_snippet and use it where possible	2010-10-24 09:17:09 -04:00
50unattended-upgrades	Merge remote branch 'nadir/master' into wip	2010-10-17 01:57:55 +02:00
preferences_snippet.erb	refactor: simplify and remove inline content	2010-10-25 00:14:33 -04:00