Garrett Honeycutt 144596197e Merge branch 'ssh_config' of https://github.com/jwennerberg/puppet-module-ssh into jwennerberg-ssh_config ...

Conflicts:
	manifests/init.pp

2013-10-15 12:14:23 -04:00

..

init.pp

Merge branch 'ssh_config' of https://github.com/jwennerberg/puppet-module-ssh into jwennerberg-ssh_config

2013-10-15 12:14:23 -04:00