From: Peter Palfrader <peter@palfrader.org>
Date: Thu, 21 Jan 2010 18:31:12 +0000 (+0100)
Subject: Merge branch 'master' of ssh://handel.debian.org/srv/puppet.debian.org/git/dsa-puppet
X-Git-Url: https://git.donarmstrong.com/?p=dsa-puppet.git;a=commitdiff_plain;h=45c80304279ca3f7e6db329cbf8e4566433ed35e

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

* 'master' of ssh://handel.debian.org/srv/puppet.debian.org/git/dsa-puppet: (40 commits)
  somehow missed mayer
  fuck, really, stop
  stop including ferm for now
  apparently, puppet is not fond of sloppy line endings
  Revert "Revert "not breaking the paths in production branch maybe helps""
  try without extra whitespace
  Revert "not breaking the paths in production branch maybe helps"
  Revert "Revert "not breaking the paths in production branch maybe helps""
  Revert "not breaking the paths in production branch maybe helps"
  not breaking the paths in production branch maybe helps
  single quotes
  single quotes
  Revert "does that work?"
  does that work?
  Revert "maybe staging needs a default environment of staging?"
  the right path helps
  we lost two lines
  picky puppet
  ferm initial checkin
  Initial stab at adding a ferm module
  ...
---

45c80304279ca3f7e6db329cbf8e4566433ed35e