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)
* '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


Trivial merge