]> gitweb.fluxo.info Git - puppet-sshd.git/commitdiff
Merge remote-tracking branch 'shared/master'
authormh <mh@immerda.ch>
Fri, 29 Jul 2011 17:31:41 +0000 (19:31 +0200)
committermh <mh@immerda.ch>
Fri, 29 Jul 2011 17:31:41 +0000 (19:31 +0200)

Trivial merge