From: Antoine Beaupré <anarcat@koumbit.org>
Date: Fri, 17 Apr 2015 18:47:03 +0000 (-0400)
Subject: Merge remote-tracking branch 'micah/remove_etch' into shared
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=e9596d0f6d243ae00bb5b360a5c37bed577c5438;p=puppet-sshd.git

Merge remote-tracking branch 'micah/remove_etch' into shared

Conflicts:
	templates/sshd_config/Debian_etch.erb
---

e9596d0f6d243ae00bb5b360a5c37bed577c5438