]> git.donarmstrong.com Git - dsa-puppet.git/commitdiff
projects / dsa-puppet.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d8c44af 302bfad)
Merge branch 'master' of ssh://handel.debian.org/srv/puppet.debian.org/git/dsa-puppet
authorPeter Palfrader <peter@palfrader.org>
Sun, 23 May 2010 12:26:10 +0000 (14:26 +0200)
committerPeter Palfrader <peter@palfrader.org>
Sun, 23 May 2010 12:26:10 +0000 (14:26 +0200)
* 'master' of ssh://handel.debian.org/srv/puppet.debian.org/git/dsa-puppet:
  Revert "pettersson has bpo acpid"


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.