Jerome Charaoui 8ed07cac2f Merge branch 'master' of git://git.puppet.immerda.ch/module-apt ... Conflicts: templates/Debian/sources.list.erb		2015-02-20 16:15:02 -05:00
..
Debian	Merge branch 'master' of git://git.puppet.immerda.ch/module-apt	2015-02-20 16:15:02 -05:00
Ubuntu	fix for $lsbdistcodename regression introduced by ac166366d7	2012-12-05 13:46:23 -05:00
20proxy.erb	address puppet 3.x deprecation warnings	2014-04-18 10:59:26 +02:00
preferences_snippet.erb	address puppet 3.x deprecation warnings	2014-04-18 10:59:26 +02:00
preferences_snippet_release.erb	address puppet 3.x deprecation warnings	2014-04-18 10:59:26 +02:00