]> gitweb.fluxo.info Git - puppet-sshd.git/commitdiff
Merge remote-tracking branch 'shared/master'
authormh <mh@immerda.ch>
Wed, 2 Jan 2013 14:53:41 +0000 (15:53 +0100)
committermh <mh@immerda.ch>
Wed, 2 Jan 2013 14:53:41 +0000 (15:53 +0100)

Trivial merge