]> git.donarmstrong.com Git - dsa-puppet.git/commitdiff
Merge branch 'master' of ssh://handel.debian.org/~/dsa-puppet
authorLuca Filipozzi <lfilipoz@emyr.net>
Wed, 16 May 2012 22:35:02 +0000 (22:35 +0000)
committerLuca Filipozzi <lfilipoz@emyr.net>
Wed, 16 May 2012 22:35:02 +0000 (22:35 +0000)

Trivial merge