Merge branch 'master' of ssh://handel.debian.org/srv/puppet.debian.org/git/dsa-puppet
authorPeter Palfrader <peter@palfrader.org>
Sun, 31 Jan 2010 21:40:33 +0000 (22:40 +0100)
committerPeter Palfrader <peter@palfrader.org>
Sun, 31 Jan 2010 21:40:33 +0000 (22:40 +0100)
* 'master' of ssh://handel.debian.org/srv/puppet.debian.org/git/dsa-puppet:
  add aacraid fact
  add alkman.debian.org
  add purcell to mailout


Trivial merge