]> gitweb.fluxo.info Git - puppet-sshd.git/commitdiff
Merge branch 'master' of git://labs.riseup.net/shared-sshd
authorSilvio Rhatto <rhatto@riseup.net>
Thu, 17 Jan 2013 23:43:33 +0000 (21:43 -0200)
committerSilvio Rhatto <rhatto@riseup.net>
Thu, 17 Jan 2013 23:43:33 +0000 (21:43 -0200)
Conflicts:
templates/sshd_config/Ubuntu_precise.erb


Trivial merge