intrigeri 71d42350d1 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		2010-11-21 16:38:50 +01:00
..
02show_upgraded	Add file headers for awareness of puppet presence	2010-10-25 01:13:44 -04:00
03clean	Add file headers for awareness of puppet presence	2010-10-25 01:13:44 -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