]> git.donarmstrong.com Git - dsa-puppet.git/commitdiff
Merge branch 'master' of ssh://handel.debian.org/~/dsa-puppet
authorLuca Filipozzi <lfilipoz@emyr.net>
Sat, 7 Apr 2012 17:25:39 +0000 (17:25 +0000)
committerLuca Filipozzi <lfilipoz@emyr.net>
Sat, 7 Apr 2012 17:25:39 +0000 (17:25 +0000)

Trivial merge