From: Martin Zobel-Helas <zobel@debian.org>
Date: Fri, 22 Oct 2010 07:41:41 +0000 (+0200)
Subject: Merge branch 'master' of git+ssh://puppet.debian.org/srv/puppet.debian.org/git/dsa... 
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=760bc61e956da7156379af9d3502f58e6d65583f;p=mirror%2Fdsa-puppet.git

Merge branch 'master' of git+ssh://puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet

* 'master' of git+ssh://puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet:
  move 0755 for rc.local
  Samhain ignore /etc/rc.local
  Add puppet boilerplate comment to rc.local
  a better try
  First stab at managing rc.local
---

760bc61e956da7156379af9d3502f58e6d65583f