Merge branch 'shared'

Conflicts:
	README

diff --cc README
index 8395501bb3dcd540fde2d6d9750d70cad2e9016a,06f29ea0b09e05cfa3a9c25feffdbaf271dbd550..d5acff35ca266f6c19248ef0ddc4a11f4da8a532
--- 1/README
--- 2/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
  =============

diff --cc manifests/debian.pp
Simple merge