]> git.donarmstrong.com Git - dsa-puppet.git/commitdiff
projects / dsa-puppet.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e8f9fa7 bf7bc9b)
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)
* '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


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.