Merge branch 'master' into leap

this brings our master back to before we made some changes. I've split out
those changes into topic branches, and rebased them on top of the current state
of master. I will merge those in next

Conflicts:
	manifests/init.pp
	templates/distributions.erb

1 files changed, 6 insertions, 0 deletions

diff --git a/README b/README
index 3e5d5d5..d4c5135 100644
--- a/README
+++ b/README
@@ -21,6 +21,12 @@ Instead of:
 
   class { 'reprepro': origin => 'example.com' }
 
+Even more recent versions do not use parametrized classes anymore but
+defines, in order to support multiple repositories. So you should do
+instead:
+
+  reprepro::repository { "default": origin => 'example.com' }
+
 Parameters
 ==========