From: Martin Zobel-Helas <zobel@debian.org>
Date: Sun, 19 Feb 2012 12:31:05 +0000 (+0100)
Subject: Merge branch 'master' of git+ssh://puppet.debian.org/srv/puppet.debian.org/git/dsa... 
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=23f24a14a26d103b356c8b5d5e987c6ef9f2174c;p=mirror%2Fdsa-puppet.git

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:
  this is a better way to do it
  try new markup function
  add bizet
  Add barriere
  this should slow down spam a bit
---

23f24a14a26d103b356c8b5d5e987c6ef9f2174c