projects / mirror / dsa-puppet.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 3e03089 da400b7)
Merge branch 'master' of git+ssh://puppet.debian.org/srv/puppet.debian.org/git/dsa...
authorMartin Zobel-Helas <zobel@debian.org>
Mon, 17 Jan 2011 17:59:22 +0000 (18:59 +0100)
committerMartin Zobel-Helas <zobel@debian.org>
Mon, 17 Jan 2011 17:59:22 +0000 (18:59 +0100)
commit164bec7230c98899c0c828b4ae5eb21043a5d70d
treed1957bf963072683ef725150ad6d00d91a90a4f9tree | snapshot
parent3e03089963518b9bc77de36e12d55ea418aa0954commit | diff
parentda400b702973aed0c4f32ac2b54ddb8f4d2e5231commit | diff
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 alias expansion above userforward so that that can be overridden
  Same dash - everywhere
  Add danzi
Unnamed repository; edit this file 'description' to name the repository.