]> gitweb.fluxo.info Git - puppet-sshd.git/commit
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)
commite9596d0f6d243ae00bb5b360a5c37bed577c5438
treeea8e120b7d7ef84ba71391f39870092e43391627
parentd4923b2c3ad74d813a9a2e5b39b6fa171ee95bc0
parente2cad38276c2d2f0c952a5c2d2d0f9491e977961
Merge remote-tracking branch 'micah/remove_etch' into shared

Conflicts:
templates/sshd_config/Debian_etch.erb