]> gitweb.fluxo.info Git - puppet-sshd.git/commitdiff
Merge remote-tracking branch 'micah/remove_etch' into shared
authorAntoine Beaupré <anarcat@koumbit.org>
Fri, 17 Apr 2015 18:47:03 +0000 (14:47 -0400)
committerAntoine Beaupré <anarcat@koumbit.org>
Fri, 17 Apr 2015 18:47:03 +0000 (14:47 -0400)
Conflicts:
templates/sshd_config/Debian_etch.erb


Trivial merge