From: mh <mh@immerda.ch>
Date: Fri, 29 Jul 2011 17:31:41 +0000 (+0200)
Subject: Merge remote-tracking branch 'shared/master'
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=cb7cd9e314fad2cf8eb8d2c524e17a1c3e3e94d2;p=puppet-sshd.git

Merge remote-tracking branch 'shared/master'
---

cb7cd9e314fad2cf8eb8d2c524e17a1c3e3e94d2