From: mh <mh@immerda.ch>
Date: Wed, 2 Jan 2013 11:23:49 +0000 (+0100)
Subject: Merge remote-tracking branch 'shared/master'
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=bac64e7595a6d4f8d409b024a26bddb1c06188d6;p=puppet-lsb.git

Merge remote-tracking branch 'shared/master'

Conflicts:
	manifests/init.pp
---

bac64e7595a6d4f8d409b024a26bddb1c06188d6
diff --cc manifests/init.pp
index 312e0b8,c55409f..85b34e1
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@@ -1,6 -1,6 +1,6 @@@
  class lsb {
 -  case $operatingsystem {
 +  case $::operatingsystem {
-     debian: { include lsb::debian }
+     debian,ubuntu: { include lsb::debian }
      centos: { include lsb::centos }
    }
  }