intrigeri 10c7939f65 Merge remote branch 'immerda/master'. ... Conflicts: README 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 17:03:57 +01:00
..
sources.list.erb	Merge remote branch 'immerda/master'.	2010-11-21 17:03:57 +01:00