intrigeri bcfb35c969 Merge remote branch 'nadir/master' into wip ... Conflicts: manifests/default_preferences.pp manifests/default_sources_list.pp manifests/init.pp templates/Debian/sources.list.deb-src.erb templates/Debian/sources.list.erb templates/Debian/sources.list.volatile.erb templates/Ubuntu/sources.list.erb		2010-10-17 01:57:55 +02:00
..
50unattended-upgrades	Merge remote branch 'nadir/master' into wip	2010-10-17 01:57:55 +02:00