]> git.donarmstrong.com Git - dsa-puppet.git/commit
Merge branch 'master' of git+ssh://puppet.debian.org/srv/puppet.debian.org/git/dsa...
authorMartin Zobel-Helas <zobel@debian.org>
Sun, 19 Feb 2012 12:31:05 +0000 (13:31 +0100)
committerMartin Zobel-Helas <zobel@debian.org>
Sun, 19 Feb 2012 12:31:05 +0000 (13:31 +0100)
commit23f24a14a26d103b356c8b5d5e987c6ef9f2174c
tree83bafd312dd051048f7b0c55c526c5a5bd687d79
parente8f9fa747b79a5d7ac5dd740055fe582c8ff1faa
parentbf7bc9b417ad6200ee25094b85fd7508c7a18226
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