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
..
Debian	Merge commit '1b0bc415977c1c8b49390e0cdb1361769e0fdbae'.	2010-11-21 16:38:50 +01:00
Ubuntu	Merge commit '1b0bc415977c1c8b49390e0cdb1361769e0fdbae'.	2010-11-21 16:38:50 +01:00
20proxy.erb	Add file headers for awareness of puppet presence	2010-10-25 01:13:44 -04:00