]> git.donarmstrong.com Git - dsa-puppet.git/commit
Merge branch 'master' of ssh://handel.debian.org/srv/puppet.debian.org/git/dsa-puppet
authorPeter Palfrader <peter@palfrader.org>
Tue, 19 Jun 2012 19:27:42 +0000 (21:27 +0200)
committerPeter Palfrader <peter@palfrader.org>
Tue, 19 Jun 2012 19:27:42 +0000 (21:27 +0200)
commitf47e3bc07ecb609dd2f180925300aa3bf503ef66
tree418054bc9aed43fde5def7f2f9fc22fd98d1990c
parentdd401e461e4a6e250300bede2d3ab65d1193fe62
parent409b8579f63b45456a3f5ac92683cf87bb2355ac
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:
  Revert "bad hack - take away in a day or so"