]> git.donarmstrong.com Git - dsa-puppet.git/commitdiff
Merge remote branch 'origin/staging' into staging
authorMartin Zobel-Helas <zobel@debian.org>
Fri, 1 Jan 2010 14:59:31 +0000 (15:59 +0100)
committerMartin Zobel-Helas <zobel@debian.org>
Fri, 1 Jan 2010 14:59:31 +0000 (15:59 +0100)

Trivial merge