From: intrigeri <intrigeri@boum.org>
Date: Wed, 2 Jan 2013 11:47:34 +0000 (+0100)
Subject: Merge branch 'shared'
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=4cfb1fc6bbe356e335d8635bbadfd6ea72f8bc20;p=puppet-loginrecords.git

Merge branch 'shared'

Conflicts:
	README
---

4cfb1fc6bbe356e335d8635bbadfd6ea72f8bc20
diff --cc README
index 8395501,06f29ea..d5acff3
--- a/README
+++ b/README
@@@ -11,8 -11,7 +11,8 @@@ Defaults to disable all supported logi
  Dependencies
  ============
  
- - the common module: git://labs.riseup.net/shared-common
 +- the lsb module: git://labs.riseup.net/shared-lsb
+ - the stdlib module from puppetlabs: http://forge.puppetlabs.com/puppetlabs/stdlib
  
  Configuration
  =============